From 99f2940e8cac51834f880e4bf61733522065d6a5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 6 Apr 2025 08:13:53 +0200 Subject: [PATCH 01/18] GitHub Actions: on workflow_dispatch * https://github.com/cpplint/cpplint/pull/358#issuecomment-2781238730 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adca99d..17acf31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: push: # paths-ignore: "*.rst" branches: [master, develop] + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 777a8a7ca2f207c2a591788b9dea7fca188004e1 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:33:54 -0400 Subject: [PATCH 02/18] Drop Python 3.8 | bump version (#334) Pylint released their update on dedeprecating the getopt and optparse modules.Should merge this after we release 2.0.1. --------- Co-authored-by: Christian Clauss --- .github/workflows/ci.yml | 6 +++--- CHANGELOG.rst | 7 ++++++- cpplint.py | 10 ++++------ cpplint_clitest.py | 2 -- cpplint_unittest.py | 2 -- pyproject.toml | 7 ++----- tox.ini | 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17acf31..59087fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: strategy: fail-fast: false matrix: - # Python 3.8 is EOL. Also adapt tox.ini - python-version: ['3.8', 'pypy3.11', '3.x'] + # Also adapt tox.ini on change + python-version: ['3.9', 'pypy3.11', '3.x'] # macOS on ARM, Ubuntu on x86, Windows on X86 os: [macos-latest, ubuntu-latest, windows-latest] steps: @@ -39,6 +39,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --editable .[dev] + pip install --editable ".[dev]" - name: Test with tox run: tox -e py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 571eb2f..022d292 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,12 @@ Changelog ********* -2.0.1 (2025-04-02) +2.1.0 (TBA) +=========== + +* Python versions less than 3.9 are no longer supported. + +2.0.1 (2025-03-09) ================== Yet another overdue... hotfix. Sorry this took so long. diff --git a/cpplint.py b/cpplint.py index 6e2cf5d..0184417 100755 --- a/cpplint.py +++ b/cpplint.py @@ -41,12 +41,12 @@ same line, but it is far from perfect (in either direction). """ -from __future__ import annotations +from __future__ import annotations # PEP 604 not in 3.9 import codecs import collections import copy -import getopt # pylint: disable=deprecated-module +import getopt import glob import itertools import math # for log @@ -6858,8 +6858,7 @@ def FilesBelongToSameModule(filename_cc, filename_h): filename_cc = filename_cc.replace("/internal/", "/") filename_h = filename_h[: -(len(fileinfo_h.Extension()))] - if filename_h.endswith("-inl"): - filename_h = filename_h[: -len("-inl")] + filename_h = filename_h.removesuffix("-inl") filename_h = filename_h.replace("/public/", "/") filename_h = filename_h.replace("/internal/", "/") @@ -7701,8 +7700,7 @@ def _ExpandDirectories(filenames): for root, _, files in os.walk(filename): for loopfile in files: fullname = os.path.join(root, loopfile) - if fullname.startswith("." + os.path.sep): - fullname = fullname[len("." + os.path.sep) :] + fullname = fullname.removeprefix("." + os.path.sep) expanded.add(fullname) return [ diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 2694712..824a07e 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -30,8 +30,6 @@ """Command Line interface integration test for cpplint.py.""" -from __future__ import annotations - import contextlib import glob import os diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 079c7d3..d0bda8e 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -32,8 +32,6 @@ # TODO(unknown): Add a good test that tests UpdateIncludeState. -from __future__ import annotations - import codecs import os import platform diff --git a/pyproject.toml b/pyproject.toml index f028050..32bccef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ authors = [ { name = "Andrew Davis", email = "theandrewdavis@gmail.com" }, { name = "cpplint developers" }, ] -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -29,7 +29,6 @@ classifiers = [ "Natural Language :: English", "Programming Language :: C++", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -43,7 +42,7 @@ dependencies = [ ] optional-dependencies.dev = [ "mypy", "parameterized", - "pylint>=2.11", + "pylint>=3.3.4", "pytest", "pytest-cov", "pytest-timeout", @@ -59,8 +58,6 @@ include-package-data = false dynamic.version = { attr = "cpplint.__VERSION__" } [tool.ruff] -target-version = "py38" - line-length = 100 lint.select = [ "A", # flake8-builtins diff --git a/tox.ini b/tox.ini index 62d43e6..f7e3911 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38, py39, py3.10, py311, py312, py313, pypy3 +envlist = py39, py310, py311, py312, py313, pypy3 skip_missing_interpreters = true From bbba111d0a886e45eb7610bb57b95edd42666f53 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:43:03 -0400 Subject: [PATCH 03/18] Some test refactoring (#357) * increase default pytest timeout to 481s for debugging room * [remove duplicate boost sample for testing inspect headers](https://github.com/cpplint/cpplint/commit/1e39bffccec7c31e7c34ea990ec7ca905cc7da67) * [use pytest parametrized instead of parameterized & google todo credit](https://github.com/cpplint/cpplint/commit/c0eb131751a00bbaa3d74f9569081f50afa8737d) * add script to update CLI test definitions --------- Co-authored-by: Christian Clauss --- cpplint_clitest.py | 7 +- cpplint_unittest.py | 9 +- pyproject.toml | 3 +- regen-defs.zsh | 48 +++++++ samples/boost-sample/exclude.def | 129 ------------------ ...nspect.def => headers_inspect_exclude.def} | 2 +- 6 files changed, 57 insertions(+), 141 deletions(-) create mode 100755 regen-defs.zsh delete mode 100644 samples/boost-sample/exclude.def rename samples/boost-sample/{headers_inspect.def => headers_inspect_exclude.def} (99%) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 824a07e..b20566f 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -39,7 +39,6 @@ import tempfile import pytest -from parameterized import parameterized # type: ignore[import-untyped] from testfixtures import compare # type: ignore[import-untyped] import cpplint # noqa: F401 @@ -55,7 +54,7 @@ def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, args: A string with arguments to the command. cwd: from which folder to run. """ - cmd, args = cmd.split(), args.split() # type: ignore[assignment] + cmd, args = cmd.split(), args.replace('"', "").split() # type: ignore[assignment] proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True, check=False) out, err = proc.stdout, proc.stderr @@ -175,14 +174,14 @@ class TestNoRepoSignature(TemporaryFolderClassSetup): def get_extra_command_args(self, cwd): return f" --repository {self._root} " - @parameterized.expand( + @pytest.mark.parametrize( + ("folder", "case"), [ (folder, case[:-4]) for folder in ["chromium", "vlc", "silly", "boost", "protobuf", "codelite", "v8"] for case in os.listdir(f"./samples/{folder}-sample") if case.endswith(".def") ], - name_func=lambda fun, _, x: f"test_{x.args[0]}_sample-{x.args[1]}", ) @pytest.mark.timeout(180) def test_samples(self, folder, case): diff --git a/cpplint_unittest.py b/cpplint_unittest.py index d0bda8e..821bc78 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -30,7 +30,7 @@ """Unit test for cpplint.py.""" -# TODO(unknown): Add a good test that tests UpdateIncludeState. +# TODO(google): Add a good test that tests UpdateIncludeState. import codecs import os @@ -43,7 +43,6 @@ import tempfile import pytest -from parameterized import parameterized # type: ignore[import-untyped] import cpplint @@ -2230,7 +2229,7 @@ def testConstStringReferenceMembers(self): "const string &turing", "const string & godel", ] - # TODO(unknown): Enable also these tests if and when we ever + # TODO(google): Enable also these tests if and when we ever # decide to check for arbitrary member references. # "const Turing & a", # "const Church& a", @@ -4604,7 +4603,7 @@ def testConditionals(self): "", ) - @parameterized.expand(["else if", "if", "while", "for", "switch"]) + @pytest.mark.parametrize("keyword", ["else if", "if", "while", "for", "switch"]) def testControlClauseWithParensNewline(self, keyword): # The % 2 part is pseudorandom whitespace-support testing self.TestLintContains( @@ -4616,7 +4615,7 @@ def testControlClauseWithParensNewline(self, keyword): f" should be on a separate line [whitespace/newline] [5]", ) - @parameterized.expand(["else", "do", "try"]) + @pytest.mark.parametrize("keyword", ["else", "do", "try"]) def testControlClauseWithoutParensNewline(self, keyword): # The % 2 part is pseudorandom whitespace-support testing self.TestLintContains( diff --git a/pyproject.toml b/pyproject.toml index 32bccef..a401639 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,6 @@ dependencies = [ ] optional-dependencies.dev = [ "mypy", - "parameterized", "pylint>=3.3.4", "pytest", "pytest-cov", @@ -206,4 +205,4 @@ addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" python_files = [ "*test.py" ] required_plugins = [ "pytest-cov", "pytest-timeout" ] testpaths = [ "." ] -timeout = 60 +timeout = 481 diff --git a/regen-defs.zsh b/regen-defs.zsh new file mode 100755 index 0000000..07c1880 --- /dev/null +++ b/regen-defs.zsh @@ -0,0 +1,48 @@ +#!/bin/zsh + +# Input the path of cpplint here +cpplint="$HOME/Documents/cpplint/cpplint.py" + +cd samples/ || exit 74 # EX_IOERROR + +# Loop through all .def files in the given directories +folders=(${(f)"$(cat)"}) +for folder in $folders; do + cd "$folder-sample/" || exit 66 # EX_NOINPUT + for file in ./*.def; do + if [[ ! -s "$file" ]]; then + echo "Skipping empty file: $file" + continue + fi + echo "Processing $file..." + + # Extract the command from the first line of the file + cmd=$(head -n 1 "$file") + + # Create temporary files for stdout and stderr + stdout_file=$(mktemp) + stderr_file=$(mktemp) + + # Execute the command and capture stdout and stderr + uv run "$cpplint" $cmd > "$stdout_file" 2> "$stderr_file" + ret_code=$? + + # Count the number of lines in stdout + (( num_lines=$(wc -l < "$stdout_file") + 1 )) + + # Overwrite the original definition file + { + echo "$cmd" + echo "$ret_code" + echo "$num_lines" + cat "$stdout_file" + echo + cat "$stderr_file" + echo + } > "$file" + + # Clean up temporary files + rm "$stdout_file" "$stderr_file" + done + cd .. +done diff --git a/samples/boost-sample/exclude.def b/samples/boost-sample/exclude.def deleted file mode 100644 index 731ffad..0000000 --- a/samples/boost-sample/exclude.def +++ /dev/null @@ -1,129 +0,0 @@ ---recursive --exclude=headers/* src -1 -4 -Done processing src/inspect/unnamed_namespace_check.hpp -Done processing src/tr1/c_policy.hpp -Total errors found: 121 - -src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] -src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] -src/inspect/unnamed_namespace_check.hpp:14: Do not use unnamed namespaces in header files. See https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces for more information. [build/namespaces_headers] [4] -src/inspect/unnamed_namespace_check.hpp:17: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:18: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:19: Closing ) should be moved to the previous line [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:21: Anonymous namespace should be terminated with "// namespace" [readability/namespace] [5] -src/inspect/unnamed_namespace_check.hpp:21: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:26: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:27: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:28: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:28: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:29: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:29: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:31: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:31: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:32: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:32: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:32: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:33: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:33: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:34: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:34: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:34: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:35: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:35: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:36: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:36: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:37: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:37: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:38: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:40: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:40: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:44: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:44: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:48: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/inspect/unnamed_namespace_check.hpp:49: Missing space before ( in for( [whitespace/parens] [5] -src/inspect/unnamed_namespace_check.hpp:50: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:54: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:54: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:57: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/inspect/unnamed_namespace_check.hpp:58: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:59: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:59: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:60: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:51: Add #include for string [build/include_what_you_use] [4] -src/tr1/c_policy.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_TR1_C_POLICY_HPP_ [build/header_guard] [5] -src/tr1/c_policy.hpp:9: Missing space before { [whitespace/braces] [5] -src/tr1/c_policy.hpp:13: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:14: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:15: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:16: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:17: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:18: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:19: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:20: public: should be indented +1 space inside struct policy [whitespace/indent] [3] -src/tr1/c_policy.hpp:21: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:22: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:23: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:24: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:25: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:26: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:27: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:28: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:32: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:34: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:35: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:36: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:37: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:39: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:44: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:45: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:46: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:47: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:48: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:49: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:50: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:51: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:52: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:53: public: should be indented +1 space inside struct policy [whitespace/indent] [3] -src/tr1/c_policy.hpp:54: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:55: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:56: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:57: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:58: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:59: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:60: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:61: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:63: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:65: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:67: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:68: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:69: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:70: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:71: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:72: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:76: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:88: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:89: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:89: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:105: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:106: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:106: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace policies" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace math" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace boost" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: At least two spaces is best between code and comments [whitespace/comments] [2] -src/tr1/c_policy.hpp:111: Missing space before { [whitespace/braces] [5] -src/tr1/c_policy.hpp:122: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:123: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:124: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:131: Namespace should be terminated with "// namespace c_policies" [readability/namespace] [5] - diff --git a/samples/boost-sample/headers_inspect.def b/samples/boost-sample/headers_inspect_exclude.def similarity index 99% rename from samples/boost-sample/headers_inspect.def rename to samples/boost-sample/headers_inspect_exclude.def index 3c1d647..61c147c 100644 --- a/samples/boost-sample/headers_inspect.def +++ b/samples/boost-sample/headers_inspect_exclude.def @@ -1,4 +1,4 @@ -src/inspect/* +--recursive "--exclude=src/tr1/*" src 1 3 Done processing src/inspect/unnamed_namespace_check.hpp From 97ab22d7b68125fb160cc19ba2179897c162baeb Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:52:56 -0400 Subject: [PATCH 04/18] Don't err on non-const references by default (#305) As a side note, we should probably consider not running filtered checks sometime in the future. Please squash on merge with GitHub's shiny button. --------- Co-authored-by: Christian Clauss --- CHANGELOG.rst | 5 ++++- cpplint.py | 1 + samples/codelite-sample/simple.def | 12 +----------- samples/silly-sample/cfg.def | 7 +------ samples/silly-sample/filters.def | 9 ++------- samples/silly-sample/includeorder_cfirst.def | 7 +------ samples/silly-sample/sed.def | 5 ----- samples/silly-sample/simple.def | 7 +------ 8 files changed, 11 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 022d292..8dd593a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,9 @@ Changelog =========== * Python versions less than 3.9 are no longer supported. +* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) +* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) 2.0.1 (2025-03-09) ================== @@ -26,7 +29,7 @@ Yet another overdue... hotfix. Sorry this took so long. * Add a GitHub Action to publish to PyPI by @cclauss in https://github.com/cpplint/cpplint/pull/347 2.0.0 (2024-10-06) -================ +================== A large long-overdue modernization of the codebase! diff --git a/cpplint.py b/cpplint.py index 0184417..2df82f3 100755 --- a/cpplint.py +++ b/cpplint.py @@ -411,6 +411,7 @@ _DEFAULT_FILTERS = [ "-build/include_alpha", "-readability/fn_size", + "-runtime/references", ] # The default list of categories suppressed for C (not C++) files. diff --git a/samples/codelite-sample/simple.def b/samples/codelite-sample/simple.def index 012d3bc..069767f 100644 --- a/samples/codelite-sample/simple.def +++ b/samples/codelite-sample/simple.def @@ -3,7 +3,7 @@ src/* 4 Done processing src/pptable.cpp Done processing src/pptable.h -Total errors found: 685 +Total errors found: 675 src/pptable.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/pptable.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -496,7 +496,6 @@ src/pptable.cpp:534: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:538: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:539: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:542: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.cpp:542: Is this a non-const reference? If so, make const or use a pointer: wxString &outStr [runtime/references] [2] src/pptable.cpp:543: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:544: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:545: Tab found; better to use spaces [whitespace/tab] [1] @@ -534,7 +533,6 @@ src/pptable.cpp:578: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:579: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:582: Static/global string variables are not permitted. [runtime/string] [4] src/pptable.cpp:584: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.cpp:584: Is this a non-const reference? If so, make const or use a pointer: std::string& outStr [runtime/references] [2] src/pptable.cpp:585: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:586: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:587: Tab found; better to use spaces [whitespace/tab] [1] @@ -621,9 +619,7 @@ src/pptable.h:30: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:31: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:32: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:49: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:49: Is this a non-const reference? If so, make const or use a pointer: wxString &output [runtime/references] [2] src/pptable.h:63: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:63: Is this a non-const reference? If so, make const or use a pointer: std::string& outStr [runtime/references] [2] src/pptable.h:69: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:70: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:71: Tab found; better to use spaces [whitespace/tab] [1] @@ -646,15 +642,10 @@ src/pptable.h:88: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:89: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:90: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:91: Tab found; better to use spaces [whitespace/tab] [1] -src/pptable.h:91: Is this a non-const reference? If so, make const or use a pointer: wxFFile &fp [runtime/references] [2] src/pptable.h:92: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:92: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:92: Is this a non-const reference? If so, make const or use a pointer: wxString& initList [runtime/references] [2] -src/pptable.h:92: Is this a non-const reference? If so, make const or use a pointer: wxArrayString &initListArr [runtime/references] [2] src/pptable.h:93: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:93: Is this a non-const reference? If so, make const or use a pointer: std::string& initList [runtime/references] [2] -src/pptable.h:93: Is this a non-const reference? If so, make const or use a pointer: std::vector &initListArr [runtime/references] [2] src/pptable.h:94: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:95: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:96: Tab found; better to use spaces [whitespace/tab] [1] @@ -676,7 +667,6 @@ src/pptable.h:115: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:115: Extra space before ( in function call [whitespace/parens] [4] src/pptable.h:116: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:117: Tab found; better to use spaces [whitespace/tab] [1] -src/pptable.h:117: Is this a non-const reference? If so, make const or use a pointer: wxFFile &fp [runtime/references] [2] src/pptable.h:118: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:119: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:120: Tab found; better to use spaces [whitespace/tab] [1] diff --git a/samples/silly-sample/cfg.def b/samples/silly-sample/cfg.def index 9e3b03e..b0e424d 100644 --- a/samples/silly-sample/cfg.def +++ b/samples/silly-sample/cfg.def @@ -3,22 +3,17 @@ 4 Done processing src/sillycode.cpp Done processing src/sillycode.w -Total errors found: 26 +Total errors found: 21 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:85: Constructors callable with one argument should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:86: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:171: Do not use variable-length arrays. Use an appropriately named ('k' followed by CamelCase) compile-time constant for the size. [runtime/arrays] [1] src/sillycode.cpp:178: Static/global string variables are not permitted. [runtime/string] [4] src/sillycode.cpp:199: If an else has a brace on one side, it should have it on both [readability/braces] [5] diff --git a/samples/silly-sample/filters.def b/samples/silly-sample/filters.def index fcdfbaa..e0fac32 100644 --- a/samples/silly-sample/filters.def +++ b/samples/silly-sample/filters.def @@ -5,8 +5,8 @@ Done processing src/sillycode.cpp Category 'build' errors found: 5 Category 'legal' errors found: 1 Category 'readability' errors found: 4 -Category 'runtime' errors found: 12 -Total errors found: 22 +Category 'runtime' errors found: 7 +Total errors found: 17 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -14,15 +14,10 @@ src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:85: Constructors callable with one argument should be marked explicit. [runtime/explicit] [4] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:171: Do not use variable-length arrays. Use an appropriately named ('k' followed by CamelCase) compile-time constant for the size. [runtime/arrays] [1] src/sillycode.cpp:178: Static/global string variables are not permitted. [runtime/string] [4] src/sillycode.cpp:199: If an else has a brace on one side, it should have it on both [readability/braces] [5] diff --git a/samples/silly-sample/includeorder_cfirst.def b/samples/silly-sample/includeorder_cfirst.def index 84a3af5..a3b30a4 100644 --- a/samples/silly-sample/includeorder_cfirst.def +++ b/samples/silly-sample/includeorder_cfirst.def @@ -2,7 +2,7 @@ 1 3 Done processing src/sillycode.cpp -Total errors found: 123 +Total errors found: 118 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -13,7 +13,6 @@ src/sillycode.cpp:3: Found other system header after other header. Should be: s src/sillycode.cpp:4: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:40: Tab found; better to use spaces [whitespace/tab] [1] @@ -43,15 +42,11 @@ src/sillycode.cpp:110: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: At least two spaces is best between code and comments [whitespace/comments] [2] src/sillycode.cpp:113: public: should be indented +1 space inside class Vector2 [whitespace/indent] [3] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:119: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:120: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:120: Missing space after , [whitespace/comma] [3] src/sillycode.cpp:122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/sillycode.cpp:122: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:124: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:125: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:125: At least two spaces is best between code and comments [whitespace/comments] [2] diff --git a/samples/silly-sample/sed.def b/samples/silly-sample/sed.def index e4a40cc..b3778ee 100644 --- a/samples/silly-sample/sed.def +++ b/samples/silly-sample/sed.def @@ -17,7 +17,6 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:4: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] # src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces] [5] # src/sillycode.cpp:8: "public: should be indented +1 space inside class Date" [whitespace/indent] [3] -# src/sillycode.cpp:14: "Is this a non-const reference? If so, make const or use a pointer: vector& v" [runtime/references] [2] # src/sillycode.cpp:15: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:39: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:40: "Tab found; better to use spaces" [whitespace/tab] [1] @@ -47,13 +46,9 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:111: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:111: "At least two spaces is best between code and comments" [whitespace/comments] [2] # src/sillycode.cpp:113: "public: should be indented +1 space inside class Vector2" [whitespace/indent] [3] -# src/sillycode.cpp:118: "Is this a non-const reference? If so, make const or use a pointer: N::X& a" [runtime/references] [2] -# src/sillycode.cpp:118: "Is this a non-const reference? If so, make const or use a pointer: N::X& b" [runtime/references] [2] # src/sillycode.cpp:119: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:120: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:122: "Weird number of spaces at line-start. Are you using a 2-space indent?" [whitespace/indent] [3] -# src/sillycode.cpp:123: "Is this a non-const reference? If so, make const or use a pointer: N::X& a" [runtime/references] [2] -# src/sillycode.cpp:123: "Is this a non-const reference? If so, make const or use a pointer: N::X& b" [runtime/references] [2] # src/sillycode.cpp:124: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:125: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:125: "At least two spaces is best between code and comments" [whitespace/comments] [2] diff --git a/samples/silly-sample/simple.def b/samples/silly-sample/simple.def index e9a3fee..7bc1dc6 100644 --- a/samples/silly-sample/simple.def +++ b/samples/silly-sample/simple.def @@ -3,7 +3,7 @@ src/* 4 Done processing src/sillycode.cpp Done processing src/sillycode.w -Total errors found: 126 +Total errors found: 121 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -14,7 +14,6 @@ src/sillycode.cpp:3: Found C system header after other header. Should be: silly src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:40: Tab found; better to use spaces [whitespace/tab] [1] @@ -44,15 +43,11 @@ src/sillycode.cpp:110: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: At least two spaces is best between code and comments [whitespace/comments] [2] src/sillycode.cpp:113: public: should be indented +1 space inside class Vector2 [whitespace/indent] [3] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:119: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:120: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:120: Missing space after , [whitespace/comma] [3] src/sillycode.cpp:122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/sillycode.cpp:122: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:124: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:125: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:125: At least two spaces is best between code and comments [whitespace/comments] [2] From 74ba7c452984920c33d9305b729f940dc19658cb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 18:40:10 -0400 Subject: [PATCH 05/18] [pre-commit.ci] pre-commit autoupdate (#366) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.2 → v0.11.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.2...v0.11.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5553dc..7eb37f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.2 + rev: v0.11.4 hooks: - id: ruff - id: ruff-format From 55670e8851b76fb6246c8d2eed500068a28976e6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 01:14:21 +0200 Subject: [PATCH 06/18] Actions: No need to run pre-commit twice (#363) https://pre-commit.ci is running on every pull request at https://results.pre-commit.ci/repo/github/47154941 so pre-commit does not also need to be run in GitHub Actions. --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59087fe..d255e9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: pipx run pre-commit run --all-files - build-test: runs-on: ${{ matrix.os }} strategy: From 994273f77a20e0951ae2dd5d47f3049526c4768f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 01:55:20 +0200 Subject: [PATCH 07/18] GitHub Actions: Remove filters to ensure tests are always run (#364) Fixes: #358 * #358 is too complex (which may lead to loopholes) and requires us to give special permissions to a GitHub Action that is not verified in the Marketplace. Given GitHub Actions software supply chain attacks in recent weeks, it is better to err on the side of precaution and run tests on all pull requests. --- Special permissions --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d255e9a..a0498d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,7 @@ name: Test on: pull_request: - paths-ignore: "*.rst" push: - # paths-ignore: "*.rst" branches: [master, develop] workflow_dispatch: concurrency: From 569ab6232fbf2a6b240c9429a7676432a88557ef Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 23 Mar 2025 15:42:21 -0400 Subject: [PATCH 08/18] chore: refactor part of NestingState.Update() Split out parentheses counting namespace consumption to have enough available conditional branches for next commit Add type hints # Conflicts: # cpplint.py --- cpplint.py | 101 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 42 deletions(-) diff --git a/cpplint.py b/cpplint.py index 2df82f3..9cfda55 100755 --- a/cpplint.py +++ b/cpplint.py @@ -3198,7 +3198,7 @@ def __init__(self): # - _ClassInfo: a class or struct. # - _NamespaceInfo: a namespace. # - _BlockInfo: some other type of block. - self.stack = [] + self.stack: list[_BlockInfo] = [] # Top of the previous stack before each Update(). # @@ -3209,7 +3209,7 @@ def __init__(self): # # We could save the full stack, but we only need the top. Copying # the full nesting stack would slow down cpplint by ~10%. - self.previous_stack_top = [] + self.previous_stack_top: _BlockInfo | None = None # The number of open parentheses in the previous stack top before the last update. # Used to prevent false indentation detection when e.g. a function parameter is indented. @@ -3370,8 +3370,61 @@ def UpdatePreprocessor(self, line): # TODO(google): unexpected #endif, issue warning? pass + + def _CountOpenParentheses(self, line: str): + # Count parentheses. This is to avoid adding struct arguments to + # the nesting stack. + if self.stack: + inner_block = self.stack[-1] + depth_change = line.count("(") - line.count(")") + inner_block.open_parentheses += depth_change + + # Also check if we are starting or ending an inline assembly block. + if inner_block.inline_asm in (_NO_ASM, _END_ASM): + if ( + depth_change != 0 + and inner_block.open_parentheses == 1 + and _MATCH_ASM.match(line) + ): + # Enter assembly block + inner_block.inline_asm = _INSIDE_ASM + else: + # Not entering assembly block. If previous line was _END_ASM, + # we will now shift to _NO_ASM state. + inner_block.inline_asm = _NO_ASM + elif inner_block.inline_asm == _INSIDE_ASM and inner_block.open_parentheses == 0: + # Exit assembly block + inner_block.inline_asm = _END_ASM + + def _UpdateNamesapce(self, line: str, linenum: int) -> str | None: + """ + Match start of namespace, append to stack, and consume line + Args: + line: Line to check and consume + linenum: Line number of the line to check + + Returns: + The consumed line if namespace matched; None otherwise + """ + # Match start of namespace. The "\b\s*" below catches namespace + # declarations even if it weren't followed by a whitespace, this + # is so that we don't confuse our namespace checker. The + # missing spaces will be flagged by CheckSpacing. + namespace_decl_match = re.match(r"^\s*namespace\b\s*([:\w]+)?(.*)$", line) + if not namespace_decl_match: + return None + + new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) + self.stack.append(new_namespace) + + line = namespace_decl_match.group(2) + if line.find("{") != -1: + new_namespace.seen_open_brace = True + line = line[line.find("{") + 1 :] + return line + # TODO(google): Update() is too long, but we will refactor later. - def Update(self, filename, clean_lines, linenum, error): + def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error): """Update nesting state with current line. Args: @@ -3396,49 +3449,13 @@ def Update(self, filename, clean_lines, linenum, error): # Update pp_stack self.UpdatePreprocessor(line) - # Count parentheses. This is to avoid adding struct arguments to - # the nesting stack. - if self.stack: - inner_block = self.stack[-1] - depth_change = line.count("(") - line.count(")") - inner_block.open_parentheses += depth_change - - # Also check if we are starting or ending an inline assembly block. - if inner_block.inline_asm in (_NO_ASM, _END_ASM): - if ( - depth_change != 0 - and inner_block.open_parentheses == 1 - and _MATCH_ASM.match(line) - ): - # Enter assembly block - inner_block.inline_asm = _INSIDE_ASM - else: - # Not entering assembly block. If previous line was _END_ASM, - # we will now shift to _NO_ASM state. - inner_block.inline_asm = _NO_ASM - elif inner_block.inline_asm == _INSIDE_ASM and inner_block.open_parentheses == 0: - # Exit assembly block - inner_block.inline_asm = _END_ASM + self._CountOpenParentheses(line) # Consume namespace declaration at the beginning of the line. Do # this in a loop so that we catch same line declarations like this: # namespace proto2 { namespace bridge { class MessageSet; } } - while True: - # Match start of namespace. The "\b\s*" below catches namespace - # declarations even if it weren't followed by a whitespace, this - # is so that we don't confuse our namespace checker. The - # missing spaces will be flagged by CheckSpacing. - namespace_decl_match = re.match(r"^\s*namespace\b\s*([:\w]+)?(.*)$", line) - if not namespace_decl_match: - break - - new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) - self.stack.append(new_namespace) - - line = namespace_decl_match.group(2) - if line.find("{") != -1: - new_namespace.seen_open_brace = True - line = line[line.find("{") + 1 :] + while (new_line := self._UpdateNamesapce(line, linenum)) is not None: # could be empty str + line = new_line # Look for a class declaration in whatever is left of the line # after parsing namespaces. The regexp accounts for decorated classes From 48e8d85d8d266edad37c1f07f4bd590b612c4b35 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 23 Mar 2025 15:48:48 -0400 Subject: [PATCH 09/18] fix(indentation_namespace): false positive for MemInitLists Fix whitespace/indentation_namespace false positive for member initializer lists (MemInitLists) Adds new _ConstructorInfo, _WrappedInfo, and _MemInitListInfo nesting stack element classes Remember last-popped nesting stack item Update descriptor.pb.cc to 2016-12-16 version (commit 183d31c) --- CHANGELOG.rst | 3 +- cpplint.py | 174 +- cpplint_unittest.py | 48 + .../boost-sample/headers_inspect_exclude.def | 3 +- samples/protobuf-sample/simple.def | 3107 ++--- samples/protobuf-sample/src/descriptor.pb.cc | 10756 ++++++++-------- 6 files changed, 6949 insertions(+), 7142 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8dd593a..2555e1c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,7 @@ Changelog =========== * Python versions less than 3.9 are no longer supported. -* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) -* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) 2.0.1 (2025-03-09) diff --git a/cpplint.py b/cpplint.py index 9cfda55..8498ee6 100755 --- a/cpplint.py +++ b/cpplint.py @@ -3097,6 +3097,14 @@ def CheckEnd(self, filename, clean_lines, linenum, error): ) +class _ConstructorInfo(_BlockInfo): + """Stores information about a constructor. + For detecting member initializer lists.""" + + def __init__(self, linenum: int): + _BlockInfo.__init__(self, linenum, seen_open_brace=False) + + class _NamespaceInfo(_BlockInfo): """Stores information about a namespace.""" @@ -3174,6 +3182,22 @@ def CheckEnd(self, filename, clean_lines, linenum, error): ) +class _WrappedInfo(_BlockInfo): + """Stores information about parentheses, initializer lists, etc. + Not exactly a block but we do need the same signature. + Needed to avoid namespace indentation false positives, + though parentheses tracking would slow us down a lot + and is effectively already done by open_parentheses.""" + + pass + + +class _MemInitListInfo(_WrappedInfo): + """Stores information about member initializer lists.""" + + pass + + class _PreprocessorInfo: """Stores checkpoints of nesting stacks when #if/#else is seen.""" @@ -3216,6 +3240,9 @@ def __init__(self): # We can't use previous_stack_top, a shallow copy whose open_parentheses value is updated. self.previous_open_parentheses = 0 + # The last stack item we popped. + self.popped_top: _BlockInfo | None = None + # Stack of _PreprocessorInfo objects. self.pp_stack = [] @@ -3370,6 +3397,9 @@ def UpdatePreprocessor(self, line): # TODO(google): unexpected #endif, issue warning? pass + def _Pop(self): + """Pop the innermost state (top of the stack) and remember the popped item.""" + self.popped_top = self.stack.pop() def _CountOpenParentheses(self, line: str): # Count parentheses. This is to avoid adding struct arguments to @@ -3423,6 +3453,22 @@ def _UpdateNamesapce(self, line: str, linenum: int) -> str | None: line = line[line.find("{") + 1 :] return line + def _UpdateConstructor(self, line: str, linenum: int, class_name: str | None = None): + """ + Check if the given line is a constructor. + Args: + line: Line to check. + class_name: If line checked is inside of a class block, a str of the class's name; + otherwise, None. + """ + if not class_name: + if not re.match(r"\s*(\w*)\s*::\s*\1\s*\(", line): + return + elif not re.match(rf"\s*{re.escape(class_name)}\s*\(", line): + return + + self.stack.append(_ConstructorInfo(linenum)) + # TODO(google): Update() is too long, but we will refactor later. def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error): """Update nesting state with current line. @@ -3492,36 +3538,56 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) if not self.SeenOpenBrace(): self.stack[-1].CheckBegin(filename, clean_lines, linenum, error) - # Update access control if we are inside a class/struct + # Update access control if we are directly inside a class/struct if self.stack and isinstance(self.stack[-1], _ClassInfo): - classinfo = self.stack[-1] - access_match = re.match( - r"^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?" - r":(?:[^:]|$)", - line, + if self.stack[-1].seen_open_brace: + classinfo: _ClassInfo = self.stack[-1] + # Update access control + if access_match := re.match( + r"^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?" + r":([^:].*|$)", + line, + ): + classinfo.access = access_match.group(2) + + # Check that access keywords are indented +1 space. Skip this + # check if the keywords are not preceded by whitespaces. + indent = access_match.group(1) + if len(indent) != classinfo.class_indent + 1 and re.match(r"^\s*$", indent): + if classinfo.is_struct: + parent = "struct " + classinfo.name + else: + parent = "class " + classinfo.name + slots = "" + if access_match.group(3): + slots = access_match.group(3) + error( + filename, + linenum, + "whitespace/indent", + 3, + f"{access_match.group(2)}{slots}:" + f" should be indented +1 space inside {parent}", + ) + + line = access_match.group(4) + else: + self._UpdateConstructor(line, linenum, class_name=classinfo.name) + else: # Not in class + self._UpdateConstructor(line, linenum) + + # If brace not open and we just finished a parenthetical definition, + # check if we're in a member initializer list following a constructor. + if ( + self.stack + and ( + isinstance(self.stack[-1], _ConstructorInfo) + or isinstance(self.previous_stack_top, _ConstructorInfo) ) - if access_match: - classinfo.access = access_match.group(2) - - # Check that access keywords are indented +1 space. Skip this - # check if the keywords are not preceded by whitespaces. - indent = access_match.group(1) - if len(indent) != classinfo.class_indent + 1 and re.match(r"^\s*$", indent): - if classinfo.is_struct: - parent = "struct " + classinfo.name - else: - parent = "class " + classinfo.name - slots = "" - if access_match.group(3): - slots = access_match.group(3) - error( - filename, - linenum, - "whitespace/indent", - 3, - f"{access_match.group(2)}{slots}:" - f" should be indented +1 space inside {parent}", - ) + and not self.stack[-1].seen_open_brace + and re.search(r"[^:]:[^:]", line) + ): + self.stack.append(_MemInitListInfo(linenum, seen_open_brace=False)) # Consume braces or semicolons from what's left of the line while True: @@ -3532,10 +3598,13 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) token = matched.group(1) if token == "{": - # If namespace or class hasn't seen a opening brace yet, mark + # If namespace or class hasn't seen an opening brace yet, mark # namespace/class head as complete. Push a new block onto the # stack otherwise. if not self.SeenOpenBrace(): + # End of initializer list wrap if present + if isinstance(self.stack[-1], _MemInitListInfo): + self._Pop() self.stack[-1].seen_open_brace = True elif re.match(r'^extern\s*"[^"]*"\s*\{', line): self.stack.append(_ExternCInfo(linenum)) @@ -3543,23 +3612,28 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) self.stack.append(_BlockInfo(linenum, True)) if _MATCH_ASM.match(line): self.stack[-1].inline_asm = _BLOCK_ASM - - elif token in {";", ")"}: + elif token == ";": # If we haven't seen an opening brace yet, but we already saw # a semicolon, this is probably a forward declaration. Pop # the stack for these. - # + if not self.SeenOpenBrace(): + self._Pop() + elif token == ")": # Similarly, if we haven't seen an opening brace yet, but we # already saw a closing parenthesis, then these are probably # function arguments with extra "class" or "struct" keywords. # Also pop these stack for these. - if not self.SeenOpenBrace(): - self.stack.pop() + if ( + self.stack + and not self.stack[-1].seen_open_brace + and isinstance(self.stack[-1], _ClassInfo) + ): + self._Pop() else: # token == '}' # Perform end of block checks and pop the stack. if self.stack: self.stack[-1].CheckEnd(filename, clean_lines, linenum, error) - self.stack.pop() + self._Pop() line = matched.group(2) def InnermostClass(self): @@ -7097,11 +7171,11 @@ def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error): # Returns true if we are at a new block, and it is directly # inside of a namespace. -def IsBlockInNameSpace(nesting_state, is_forward_declaration): +def IsBlockInNameSpace(nesting_state: NestingState, is_forward_declaration: bool): # noqa: FBT001 """Checks that the new block is directly in a namespace. Args: - nesting_state: The _NestingState object that contains info about our state. + nesting_state: The NestingState object that contains info about our state. is_forward_declaration: If the class is a forward declared class. Returns: Whether or not the new block is directly in a namespace. @@ -7117,7 +7191,13 @@ def IsBlockInNameSpace(nesting_state, is_forward_declaration): if ( len(nesting_state.stack) > 1 and isinstance(nesting_state.previous_stack_top, _NamespaceInfo) - and isinstance(nesting_state.stack[-2], _NamespaceInfo) + and ( + isinstance(nesting_state.stack[-2], _NamespaceInfo) + or len(nesting_state.stack) > 2 # Accommodate for WrappedInfo + and issubclass(type(nesting_state.stack[-1]), _WrappedInfo) + and not nesting_state.stack[-2].seen_open_brace + and isinstance(nesting_state.stack[-3], _NamespaceInfo) + ) ): return True return False @@ -7141,6 +7221,10 @@ def ShouldCheckNamespaceIndentation( only works for classes and namespaces inside of a namespace. """ + # Required by all checks involving nesting_state + if not nesting_state.stack: + return False + is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments, linenum) if not (is_namespace_indent_item or is_forward_declaration): @@ -7154,6 +7238,20 @@ def ShouldCheckNamespaceIndentation( if nesting_state.previous_stack_top and nesting_state.previous_open_parentheses > 0: return False + # Skip if we are extra-indenting a member initializer list. + if ( + isinstance(nesting_state.previous_stack_top, _ConstructorInfo) # F/N (A::A() : _a(0) {/{}) + and ( + isinstance(nesting_state.stack[-1], _MemInitListInfo) + or isinstance(nesting_state.popped_top, _MemInitListInfo) + ) + ) or ( # popping constructor after MemInitList on the same line (: _a(a) {}) + isinstance(nesting_state.previous_stack_top, _ConstructorInfo) + and isinstance(nesting_state.popped_top, _ConstructorInfo) + and re.search(r"[^:]:[^:]", raw_lines_no_comments[linenum]) + ): + return False + return IsBlockInNameSpace(nesting_state, is_forward_declaration) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 821bc78..730babd 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -323,6 +323,54 @@ def testNamespaceIndentationIndentedParameter(self): results = self.GetNamespaceResults(lines) assert results == "" + def testNamespaceIndentationMemberInitializerList(self): + lines = [ + "namespace Opossum {", + "", + "Acme::Acme(const std::shared_ptr left,", + " const std::shared_ptr nigh)", + " : _left(left), _behind(nigh) {}", + "", + "} // namespace Opossum", + ] + assert self.GetNamespaceResults(lines) == "" + + # Multiline member initializer List + lines = [ + "namespace Rosenfield {", + "class Crush : public Habitual {", + " public:", + " Crush() : _a(1),", + " _b(2)", + " {}", + "};", + "} // namespace Rosenfield", + ] + assert self.GetNamespaceResults(lines) == "" + + # Same line as constructor declaration + lines = [ + "namespace Boucher {", + " X::X() : _s(2) {}", + " A::A() : _e(12) {", + ] + assert self.GetNamespaceResults(lines) == [ + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + ] + + # Definition on indented line + lines = [ + "namespace Store {", + "", + " Color::Color() : my_name_is('b')", + " this_is_true(true) {", + ] + assert ( + self.GetNamespaceResults(lines) + == "Do not indent within a namespace. [whitespace/indent_namespace] [4]" + ) + def testNestingInNamespace(self): lines = [ "namespace Test {", diff --git a/samples/boost-sample/headers_inspect_exclude.def b/samples/boost-sample/headers_inspect_exclude.def index 61c147c..dec5394 100644 --- a/samples/boost-sample/headers_inspect_exclude.def +++ b/samples/boost-sample/headers_inspect_exclude.def @@ -2,7 +2,7 @@ 1 3 Done processing src/inspect/unnamed_namespace_check.hpp -Total errors found: 50 +Total errors found: 49 src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] @@ -18,7 +18,6 @@ src/inspect/unnamed_namespace_check.hpp:28: Do not indent within a namespace. src/inspect/unnamed_namespace_check.hpp:28: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:29: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:29: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/inspect/unnamed_namespace_check.hpp:30: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:31: Extra space after ( in function call [whitespace/parens] [4] diff --git a/samples/protobuf-sample/simple.def b/samples/protobuf-sample/simple.def index 963eaba..23c4688 100644 --- a/samples/protobuf-sample/simple.def +++ b/samples/protobuf-sample/simple.def @@ -4,7 +4,7 @@ src/* Done processing src/descriptor.pb.cc Done processing src/descriptor.pb.h Done processing src/descriptor_unittest.cc -Total errors found: 3111 +Total errors found: 2376 src/descriptor.pb.cc:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/descriptor.pb.cc:9: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] @@ -16,2050 +16,1315 @@ src/descriptor.pb.cc:14: Found C system header after C++ system header. Should src/descriptor.pb.cc:15: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] src/descriptor.pb.cc:16: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] src/descriptor.pb.cc:17: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] -src/descriptor.pb.cc:27: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:33: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:22: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:24: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:26: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:27: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:28: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:29: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:30: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:32: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:34: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:36: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:37: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:39: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:42: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:36: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:38: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:39: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:40: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:41: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:42: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:43: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:44: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:47: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:50: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:51: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:53: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:56: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:59: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:62: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:63: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:66: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:69: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:71: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:74: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:77: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:80: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:83: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:86: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:87: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:89: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:92: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:95: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:98: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:46: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:48: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:50: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:52: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:54: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:56: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:58: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:60: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:61: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:62: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:64: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:65: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:66: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:68: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:69: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:70: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:81: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:82: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:84: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:85: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:90: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:91: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:95: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:96: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:97: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:98: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:99: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:101: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:117: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:121: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:100: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:102: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:103: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:104: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:105: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:119: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:123: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:126: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:127: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:130: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:131: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:133: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:134: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:135: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:136: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:138: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:140: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:141: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:143: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:144: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:146: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:151: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:160: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:159: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:163: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:164: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:166: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:167: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:168: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:170: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:175: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:177: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:179: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:182: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:183: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:187: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:190: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:191: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:193: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:195: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:207: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:213: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:201: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:205: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:206: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:210: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:211: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:214: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:215: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:217: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:219: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:220: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:223: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:224: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:225: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:226: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:227: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:233: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:234: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:228: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:241: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:243: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:247: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:254: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:257: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:261: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:269: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:270: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:271: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:249: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:251: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:253: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:255: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:273: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:274: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:282: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:286: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:276: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:277: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:280: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:287: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:288: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:291: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:295: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:303: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:296: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:305: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:306: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:307: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:308: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:311: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:315: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:319: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:316: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:320: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:322: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:324: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:325: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:327: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:329: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:330: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:331: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:332: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:334: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:335: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:336: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:333: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:340: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:344: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:348: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:353: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:341: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:342: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:346: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:347: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:350: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:351: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:354: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:355: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:359: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:360: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:361: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:362: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:363: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:364: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:366: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:368: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:373: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:376: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:377: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:381: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:385: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:379: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:380: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:387: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:389: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:393: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:396: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:397: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:398: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:399: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:404: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:405: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:408: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:412: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:416: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:420: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:422: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:424: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:429: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:432: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:436: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:438: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:440: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:442: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:443: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:444: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:445: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:446: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:447: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:448: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:449: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:451: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:452: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:453: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:454: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:455: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:458: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:459: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:460: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:461: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:462: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:463: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:464: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:465: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:466: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:469: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:473: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:477: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:479: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:481: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:485: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:493: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:500: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:508: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:510: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:512: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:513: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:514: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:515: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:519: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:523: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:527: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:531: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:534: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:538: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:542: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:544: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:546: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:547: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:548: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:549: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:552: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:556: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:560: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:467: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:476: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:575: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:579: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:581: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:583: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:585: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:587: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:589: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:591: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:593: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:613: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:597: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:606: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:617: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:621: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:688: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:699: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:713: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:714: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:715: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:719: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:721: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:631: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:632: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:633: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:639: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:641: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:642: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:643: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:648: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:653: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:663: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:667: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:677: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:679: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:683: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:687: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:690: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:692: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:694: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:695: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:698: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:700: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:702: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:706: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:709: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:712: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:720: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:723: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:725: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:726: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:727: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:730: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:740: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:744: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:747: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:764: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:770: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:772: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:775: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:778: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:780: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:781: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:787: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:790: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:793: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:796: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:798: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:800: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:803: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:809: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:819: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:838: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:863: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:890: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:899: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:900: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:917: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:938: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:961: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:964: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:970: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1030: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1063: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:1064: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1099: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:1100: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1133: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1176: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1182: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1187: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1188: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1197: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1211: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1213: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1249: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:735: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:746: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:749: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:760: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:836: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:905: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:980: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1004: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1009: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1056: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1058: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:1068: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1106: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1139: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1173: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1186: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1232: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1236: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1250: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1259: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1288: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1272: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1298: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1317: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1325: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1347: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1363: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1379: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1423: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1436: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1437: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1350: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1401: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1427: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1440: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1441: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1455: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1459: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1708: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1733: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:1756: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:1831: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:1832: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1856: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1860: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1865: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1868: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1895: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:1896: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1897: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1898: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1899: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1950: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1953: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1953: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1957: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1957: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1959: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1962: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1962: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1964: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1967: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1967: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1973: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1973: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1976: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1978: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1978: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1981: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1983: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1983: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1989: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2004: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2007: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2007: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2009: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2011: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2011: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2013: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2016: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2016: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2021: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2021: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2027: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2027: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2030: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2032: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2032: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2035: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2037: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2037: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2043: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2054: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2054: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2058: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2058: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2062: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2062: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2066: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2066: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2070: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2070: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:1452: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1463: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1474: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1475: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1478: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1479: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1490: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1491: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1494: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1495: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1638: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1640: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:1740: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1773: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1786: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1869: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:1882: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1915: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1918: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1921: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1942: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1943: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1944: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1992: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2008: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2014: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2031: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2039: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2063: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2070: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2075: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2075: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2079: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2079: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2083: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2083: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2087: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2087: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2091: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2091: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2096: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2096: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2109: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2109: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2113: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2113: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2113: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2117: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2126: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2139: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2139: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2143: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2143: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2143: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2169: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2173: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2229: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2233: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2241: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2246: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2259: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2271: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2276: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2315: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2340: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2342: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2344: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2352: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2359: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2381: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2384: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2384: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2386: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2388: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2388: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2390: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2393: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2393: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2398: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2398: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2400: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2404: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2404: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2407: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2409: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2409: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:2076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2088: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2093: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2167: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2171: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2175: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2197: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2201: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2227: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2231: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2257: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2287: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2291: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2299: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2317: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2329: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2334: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2374: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2396: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2399: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2402: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2404: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2412: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2414: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2414: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2420: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2434: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2442: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2443: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2444: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2463: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:2472: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2477: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2478: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2484: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2502: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:2506: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2527: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2530: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2535: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2419: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2441: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2463: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2468: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2475: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2480: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2488: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2509: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2540: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2545: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2550: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2587: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2592: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2602: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2607: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2612: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2616: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2641: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:2654: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2657: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:2658: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2669: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2685: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2692: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2700: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:2574: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2596: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2631: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2636: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2646: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2648: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:2652: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2661: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2691: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:2700: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2704: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2708: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2716: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2733: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2741: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2742: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2743: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2762: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:2771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2776: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2777: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2781: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2783: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2801: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:2805: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2826: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2829: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2849: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2891: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2901: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2715: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2729: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2747: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2759: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2785: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2832: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2863: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2868: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2873: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2897: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2900: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2911: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2915: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2940: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:2953: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2956: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:2957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2968: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2919: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2954: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2959: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2969: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2971: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:2975: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2980: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2984: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2991: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2999: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:3007: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3015: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3040: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3046: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3050: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3060: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3071: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3088: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3106: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3135: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3190: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3014: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:3023: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3027: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3052: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3059: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3074: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3082: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3179: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3191: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3222: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3260: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3268: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3351: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3433: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3479: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3504: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:3538: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3583: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:3584: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3612: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3635: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:3636: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3637: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3638: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3283: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3296: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3309: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3318: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3322: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3335: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3347: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3368: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3497: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3499: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:3533: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3579: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3639: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3691: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3691: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3695: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3695: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3695: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3715: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3715: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3719: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3719: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3743: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3743: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3747: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3747: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3747: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3767: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3767: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3771: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3771: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3792: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3795: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3795: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3797: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3799: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3799: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3801: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3804: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3804: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:3694: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:3707: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3733: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3756: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3758: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3759: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3760: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3806: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3809: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3809: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3815: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3815: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3820: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3820: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3823: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3825: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3825: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3831: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3846: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3854: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3859: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3828: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3840: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3845: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3868: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3876: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3884: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3889: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3881: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3894: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3898: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3919: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3936: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3949: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3962: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3966: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3970: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3974: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3924: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3928: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3954: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3958: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3971: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3988: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3992: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3996: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4004: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4009: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4048: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4066: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4070: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4078: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4096: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4096: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4100: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4100: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4104: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4104: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4104: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4108: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4108: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4112: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4112: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4112: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4125: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4129: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4129: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4133: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4133: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4138: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4138: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4148: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4153: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:4201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4206: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:4238: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4244: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4248: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4249: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4258: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4262: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4266: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4279: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4280: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4298: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4304: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4316: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4325: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4328: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4334: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4352: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4355: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4394: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4430: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4433: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4496: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4570: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4613: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4660: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4706: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4721: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4786: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:4802: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:4818: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:4819: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4836: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4849: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4853: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4857: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4866: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4869: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4892: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:4941: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4944: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4944: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4946: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4948: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4950: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4953: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4953: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4958: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4958: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4964: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4964: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4967: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4969: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4969: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4972: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4974: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4974: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4980: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4998: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4998: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5022: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5022: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5022: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5026: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5026: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5026: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5047: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5047: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5047: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:4001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4014: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4018: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4031: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4071: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4089: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4093: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4097: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4106: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4135: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4198: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4202: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4206: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4210: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4214: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4216: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4231: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4232: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4233: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4235: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4248: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4249: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4250: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4251: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4285: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4289: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4293: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4297: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4301: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4327: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4330: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4379: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4397: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4443: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4526: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4569: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4589: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4591: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:4617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4663: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4678: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4750: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:4764: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:4777: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4795: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4799: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4803: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4807: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4811: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4909: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4915: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4927: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4932: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4982: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4986: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5011: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5045: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5051: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5072: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5072: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5076: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5076: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5078: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5081: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5081: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5086: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5086: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5088: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5092: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5092: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5095: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5056: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5063: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5068: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5091: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5100: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5102: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5102: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5108: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5123: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5126: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5128: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5130: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5130: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5135: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5135: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5140: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5140: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5142: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5146: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5146: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5149: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5154: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5107: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5113: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5130: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5138: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5153: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5162: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5177: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5180: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5180: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5182: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5184: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5184: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5189: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5189: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5191: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5194: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5194: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5200: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5200: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5205: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5205: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5210: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5210: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5210: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5234: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5234: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5238: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5238: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5175: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5187: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5192: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5194: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5239: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5248: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5255: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5258: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5258: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5262: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5262: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5267: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5267: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5269: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5272: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5272: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5274: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5278: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5278: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5283: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5283: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5278: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5286: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5288: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5288: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5294: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5331: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5351: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5360: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5361: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5370: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5381: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:5396: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5427: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5430: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5536: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:5537: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5577: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:5614: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5617: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5617: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5619: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5621: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5621: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5623: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5626: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5626: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5628: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5631: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5631: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5637: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5637: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5640: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5642: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5642: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5645: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5647: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5647: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5653: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5668: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5674: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5678: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5679: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5688: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5699: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5716: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5722: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5734: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5753: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5756: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5779: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5794: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5911: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:5935: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:5936: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5954: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5980: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:5981: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6026: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6026: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6028: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6030: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6030: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6035: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6035: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6040: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6040: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6046: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6046: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6049: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6054: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6056: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6056: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6073: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6077: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6085: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6090: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6129: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6157: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6160: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6161: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6162: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6200: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6222: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6240: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6262: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6276: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6338: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6354: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6365: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6397: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:6410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6413: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:6414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6431: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6437: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6445: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6460: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:6502: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6505: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6505: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6507: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6509: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6509: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6511: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6514: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6514: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5358: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5360: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5403: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5433: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5455: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5511: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5513: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:5534: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5564: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:5577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5595: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5598: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5655: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5671: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5677: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5694: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5702: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5723: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5740: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5776: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5778: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5800: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5821: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5834: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5852: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5855: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5875: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5887: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5949: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5951: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:5979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6020: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6033: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6052: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6055: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6075: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6114: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6123: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6130: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6136: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6148: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6153: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6172: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6176: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6184: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6189: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6258: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6264: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6279: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6290: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6323: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6342: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6345: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6422: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6438: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6440: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:6455: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6466: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6503: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6512: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6519: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6519: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6525: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6525: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6528: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6530: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6530: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6533: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6535: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6535: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6541: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6559: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6559: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6563: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6563: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6583: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6587: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6602: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6624: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6630: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6634: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6635: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6644: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6655: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6672: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6678: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6534: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6537: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6545: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6598: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6614: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6620: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6632: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6687: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6693: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6709: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6712: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6735: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6750: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6692: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6700: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6707: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6745: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6767: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6788: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6801: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6819: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6822: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6867: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:6888: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6891: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:6892: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6910: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6913: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6936: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:6937: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6979: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6982: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6982: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6984: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6986: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6986: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6988: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6991: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6991: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6993: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6996: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6996: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7005: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7007: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7007: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7010: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7012: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7012: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7029: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7033: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7046: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7066: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7085: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7110: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7116: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7120: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7130: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7131: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7145: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7146: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6854: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6916: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6918: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:6946: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6987: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6996: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7000: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7019: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7022: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7042: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7090: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7097: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7103: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7115: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7139: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7143: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7164: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7170: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7188: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:7192: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:7199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7202: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7205: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7227: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7230: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7314: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7387: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7151: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7156: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7176: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7179: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7196: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7236: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7259: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7260: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7272: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7295: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7315: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7337: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7340: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7389: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7505: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:7521: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:7522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7539: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7543: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7486: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7491: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7501: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7503: At least two spaces is best between code and comments [whitespace/comments] [2] src/descriptor.pb.cc:7547: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7550: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7579: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:7624: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7627: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7627: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7629: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7631: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7631: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7636: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7636: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7638: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7641: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7641: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7647: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7647: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7650: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7652: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7652: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7655: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7657: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7657: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7663: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7678: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7681: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7681: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7683: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7685: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7685: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7687: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7690: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7690: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7692: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7695: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7695: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7697: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7701: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7701: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7704: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7706: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7706: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7709: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7711: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7711: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7711: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7717: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7732: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7735: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7735: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7737: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7739: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7739: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:7552: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7556: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7610: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:7623: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7641: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7649: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7652: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7728: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7735: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7741: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7744: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7744: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7746: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7749: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7749: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7751: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7755: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7755: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:7753: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7758: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7760: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7760: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7763: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7765: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7765: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7765: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7789: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7766: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7797: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7803: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7808: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7833: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7833: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7837: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7837: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7857: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7857: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7861: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7861: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7871: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7876: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:7913: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7922: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7923: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7933: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7938: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7944: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7945: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7956: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7958: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7959: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7960: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:7975: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8000: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:8004: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:8011: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8014: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8024: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8047: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8090: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8093: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8109: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7820: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7828: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7843: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7852: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7859: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7870: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7877: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7882: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7884: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7908: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7928: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8028: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8030: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8032: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8034: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8036: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8040: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8042: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8044: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8046: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8048: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8059: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8060: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8061: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8062: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8063: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8064: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8075: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8077: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8078: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8079: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8080: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8112: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8116: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8124: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8132: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8137: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8138: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8141: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8156: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8275: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8335: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8342: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8350: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8365: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8370: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8142: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8155: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8158: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8189: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8194: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8197: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8253: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8279: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8292: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8305: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8318: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8332: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8371: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8375: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8385: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8390: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8468: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8484: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8494: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8499: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8509: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8514: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8551: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8427: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8434: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8442: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8462: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8467: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8472: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8477: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8482: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8487: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8539: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:8555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8563: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8571: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8587: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8592: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8609: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:8645: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:8671: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:8690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8694: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8710: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8731: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8735: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8759: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:8760: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8762: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:8773: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8813: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8816: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8816: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8820: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8820: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8822: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8825: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8825: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8827: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8830: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8830: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8832: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8836: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8836: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8839: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8841: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8841: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8844: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8846: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8846: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8852: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8867: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8870: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8870: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8874: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8874: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8876: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8879: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8879: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8881: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8884: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8884: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8890: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8890: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8893: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8895: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8895: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8898: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8900: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8900: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8900: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8924: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8924: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8928: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8928: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8948: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8952: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8952: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8972: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8972: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8976: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8976: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8982: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8996: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8996: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8996: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8998: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9000: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9000: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9000: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8597: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8602: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8612: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8665: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8746: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:8779: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8782: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8784: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:8817: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8821: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8825: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8829: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8833: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8837: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8949: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8956: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8962: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8967: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8974: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8987: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9002: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9011: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9021: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9021: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9025: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9025: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9030: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9030: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9035: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9035: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9041: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9041: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9046: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9046: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:9024: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9036: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9041: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9043: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9049: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9057: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9075: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9075: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9079: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9079: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9099: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9099: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9103: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9103: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9123: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9123: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9127: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9127: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9171: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9171: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9175: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9175: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9192: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9195: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9195: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9197: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9199: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9199: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9204: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9204: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9209: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9209: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9211: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9215: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9215: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9220: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9220: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9223: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9225: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9225: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9225: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9246: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9249: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9249: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9251: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9253: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9253: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9255: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9258: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9258: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9263: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9263: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9269: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9269: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9274: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9274: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9279: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9279: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9279: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9296: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9300: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9304: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9313: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9332: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9341: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9342: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9363: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:9378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9403: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:9407: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:9429: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9141: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9143: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9170: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9183: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9188: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9195: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9343: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9365: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9370: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9384: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9390: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9405: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9421: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9427: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9432: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9437: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9439: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9444: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9446: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9452: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9467: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9492: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9541: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9546: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9551: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9556: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9581: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9586: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9591: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9596: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9642: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:9668: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:9669: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9689: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9719: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:9720: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9722: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:9731: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9766: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9766: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9770: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9770: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9790: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9790: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9794: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9794: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9814: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9814: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9818: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9818: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9838: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9838: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9842: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9842: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9855: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9859: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9863: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9887: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:9910: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:9939: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9949: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9972: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:9987: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10012: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:10016: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10045: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10053: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10099: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10115: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10118: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10134: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10204: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10209: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10220: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10251: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10256: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9476: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9483: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9489: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9494: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9501: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9506: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9514: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9525: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9529: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9533: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9624: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9640: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9646: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9659: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9672: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9685: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9693: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9697: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9738: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9748: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9753: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9773: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9775: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:9779: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9784: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9789: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9794: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9809: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9858: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:9871: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9923: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9934: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10062: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10071: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10168: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10171: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10172: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10195: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10260: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10287: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10310: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10330: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:10356: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:10413: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:10414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10416: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:10462: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10462: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10466: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10466: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10487: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10487: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10491: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10491: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10497: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10511: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10511: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10515: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10515: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10536: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10536: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10540: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10540: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10560: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10560: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10564: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10564: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10584: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10584: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10588: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10588: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10601: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10605: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10618: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10635: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10644: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10645: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10664: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:10679: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10704: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:10708: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10730: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10733: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10738: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10753: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10763: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10769: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10812: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10316: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10332: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10354: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:10364: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10369: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10374: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10385: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10430: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10461: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:10532: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10611: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10715: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10723: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10732: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10814: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10817: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10847: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10862: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10883: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:10909: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:10954: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:10955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10957: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:10999: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10999: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11003: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11003: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11023: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11023: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11027: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11027: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11040: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11048: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11057: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11073: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11082: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11083: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11101: If statement had no body and no else clause [whitespace/empty_if_body] [4] +src/descriptor.pb.cc:10818: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10878: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10880: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:10894: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10972: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11003: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11011: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11020: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11113: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11116: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11135: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11143: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11155: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11165: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11214: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11188: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11193: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11215: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11219: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11224: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11239: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11254: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11294: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:11295: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11336: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:11278: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] src/descriptor.pb.cc:11337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11339: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:11380: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11380: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11384: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11384: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11397: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11401: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11405: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11430: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11439: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11440: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11458: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:11473: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11507: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11512: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11528: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11571: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11596: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11651: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:11652: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11693: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:11694: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11696: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:11737: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11737: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11741: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11741: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11754: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11758: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11762: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11787: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11796: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11797: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11815: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:11830: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11861: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11418: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11422: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11426: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11435: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11498: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11521: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11524: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11530: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11538: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11603: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11605: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11609: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11624: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11669: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11710: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11766: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11770: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11774: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11783: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11869: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11879: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11885: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11928: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11953: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11968: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12008: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12050: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:12051: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12053: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:12094: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12094: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:12098: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12098: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:12111: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12115: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12119: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12128: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12144: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12152: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12153: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12154: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12163: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12175: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:12184: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12189: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12190: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12194: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11878: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11886: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11931: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11951: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11953: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11957: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11972: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12017: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12114: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12131: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12224: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12227: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12233: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12241: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12246: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12248: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12249: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12296: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12306: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12355: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12381: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12382: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12393: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12399: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12417: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12434: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12464: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12473: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12474: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12483: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12487: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12488: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12499: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12500: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12501: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:12516: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12259: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12263: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12330: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12332: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:12336: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12339: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12395: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12397: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:12456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12506: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12520: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12540: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:12544: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:12551: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12557: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12577: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12580: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12524: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12538: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12546: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12578: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12584: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12586: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12619: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12634: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12649: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12732: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12737: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12742: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12791: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12796: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12801: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12823: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12874: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:12898: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12899: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12917: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12930: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12934: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12957: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:12958: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13001: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13004: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13004: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:12594: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12604: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12612: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12622: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12633: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12647: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12650: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12671: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12716: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12726: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12728: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:12743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12747: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12800: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12804: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12830: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12837: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12880: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12889: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12896: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12905: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12914: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12919: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12921: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12927: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12986: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12988: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12990: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12992: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12994: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13004: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13005: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13006: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13008: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13008: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13010: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13013: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13013: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13015: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13018: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13018: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13017: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13020: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13024: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13024: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13029: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13029: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13034: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13034: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13034: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13040: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13058: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13058: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13062: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13062: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13019: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13037: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13050: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13076: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13079: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13087: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13091: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13096: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13084: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13113: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13116: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13116: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13118: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13120: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13120: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13122: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13125: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13127: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13130: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13130: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13130: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13136: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13136: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13126: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13141: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13141: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13146: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13146: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13146: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13152: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13170: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13170: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13174: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13174: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13194: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13194: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13198: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13198: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13218: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13218: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13222: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13222: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13239: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13242: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13242: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13244: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13246: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13246: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13251: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13251: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13253: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13256: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13256: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13258: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13262: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13262: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13267: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13267: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13270: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13272: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13272: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13293: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13296: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13296: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13298: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13300: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13300: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13302: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13305: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13305: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13307: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13310: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13310: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13312: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13316: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13316: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13319: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13321: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13321: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13324: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13326: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13326: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13332: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13349: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13357: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13358: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13359: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13368: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13369: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13379: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13381: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:13396: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13417: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13435: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13438: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13442: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13443: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13446: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13461: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13464: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13465: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13515: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13518: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13564: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13665: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13673: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13698: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:13752: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13755: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:13756: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13776: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13780: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13788: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13803: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:13816: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13838: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13847: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13848: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13865: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:13880: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13909: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13912: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13918: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13978: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14011: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14012: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14047: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:14080: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14080: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14084: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14084: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14088: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14088: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14092: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14092: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14110: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14110: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14114: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14114: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14114: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14118: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14118: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14122: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14127: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14127: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14149: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14151: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14153: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14161: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14161: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14161: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14163: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14167: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14167: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14170: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14172: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14172: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14175: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14177: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14177: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13216: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13226: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13254: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:13276: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13281: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13286: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13308: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13375: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:13388: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13407: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13411: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13444: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13480: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13484: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13488: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13492: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13497: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13514: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13523: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13530: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13536: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13541: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13548: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13553: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13561: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13648: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13670: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13675: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13682: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13687: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13695: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13710: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13726: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13732: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13737: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13744: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13749: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13792: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13794: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13796: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13803: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13804: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13832: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13847: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13851: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13868: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13873: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13876: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13877: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13888: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13889: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13892: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13922: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13937: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13938: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13974: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14015: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14031: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:14086: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14094: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14150: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14170: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:14179: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14201: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14201: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14205: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14205: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14205: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14207: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14210: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14210: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14215: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14215: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14215: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14217: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14221: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14221: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14224: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14226: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14226: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14229: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14231: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14231: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14248: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14248: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14252: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14252: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14252: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14256: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14256: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14256: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14260: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14260: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14264: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14264: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14269: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14269: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14273: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14273: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14273: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14277: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14277: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14281: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14281: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14282: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14285: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14285: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14290: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14290: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14307: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14311: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14319: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14324: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14342: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:14204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14213: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14265: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14295: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14325: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14334: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14341: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14347: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14350: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14351: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14352: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14361: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14373: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14374: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:14383: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14388: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14389: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14393: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14413: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:14417: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:14424: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14444: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14451: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14455: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14487: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14502: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14539: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14559: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14564: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14574: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14604: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14613: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14645: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:14675: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14678: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14679: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14697: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14711: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14718: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14726: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:14352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14364: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14387: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14394: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14396: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14403: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14409: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14412: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14421: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14426: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14428: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14434: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14445: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14449: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14453: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14461: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14470: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14478: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14479: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14567: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14570: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14575: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14622: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14624: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:14634: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14672: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14734: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14760: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14769: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14770: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14787: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:14802: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14808: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14831: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14840: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14900: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14933: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14934: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14969: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:15002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15006: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15006: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15006: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15010: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15010: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15014: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15014: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15019: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15019: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15036: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15039: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15039: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15043: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15043: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15043: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15045: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15048: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15048: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15053: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15053: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15053: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15055: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15059: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15059: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15064: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15064: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15067: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15069: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15069: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15075: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15093: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15093: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15138: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15142: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15146: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15155: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14981: Add #include for swap [build/include_what_you_use] [4] -src/descriptor.pb.cc:15069: Add #include for string [build/include_what_you_use] [4] +src/descriptor.pb.cc:14738: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14746: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14776: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14783: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14785: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14795: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14806: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14819: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14824: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14836: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14856: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14860: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14861: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14906: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14961: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14966: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14976: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14978: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:15007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15012: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15016: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15072: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:15081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15085: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15096: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15104: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15115: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15137: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15166: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15196: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15205: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15218: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15223: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15230: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15235: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15243: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15348: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15369: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15424: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15426: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:15436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15474: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15536: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15540: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15544: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15548: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15553: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15237: Add #include for string [build/include_what_you_use] [4] +src/descriptor.pb.cc:15518: Add #include for swap [build/include_what_you_use] [4] src/descriptor.pb.cc:5: samples/protobuf-sample/src/descriptor.pb.cc should include its header file samples/protobuf-sample/src/descriptor.pb.h [build/include] [5] src/descriptor.pb.h:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/descriptor.pb.h:4: #ifndef header guard has wrong style, please use: SAMPLES_PROTOBUF_SAMPLE_SRC_DESCRIPTOR_PB_H_ [build/header_guard] [5] diff --git a/samples/protobuf-sample/src/descriptor.pb.cc b/samples/protobuf-sample/src/descriptor.pb.cc index 4d5c4d9..bb44544 100644 --- a/samples/protobuf-sample/src/descriptor.pb.cc +++ b/samples/protobuf-sample/src/descriptor.pb.cc @@ -19,113 +19,78 @@ namespace google { namespace protobuf { +class FileDescriptorSetDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_; +class FileDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_; +class DescriptorProto_ExtensionRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_; +class DescriptorProto_ReservedRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_; +class DescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_; +class FieldDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_; +class OneofDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_; +class EnumDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_; +class EnumValueDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_; +class ServiceDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_; +class MethodDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_; +class FileOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileOptionsDefaultTypeInternal _FileOptions_default_instance_; +class MessageOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_; +class FieldOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_; +class OneofOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_; +class EnumOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_; +class EnumValueOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_; +class ServiceOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_; +class MethodOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_; +class UninterpretedOption_NamePartDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_; +class UninterpretedOptionDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_; +class SourceCodeInfo_LocationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_; +class SourceCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_; +class GeneratedCodeInfo_AnnotationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_; +class GeneratedCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_; namespace { -const ::google::protobuf::Descriptor* FileDescriptorSet_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileDescriptorSet_reflection_ = NULL; -const ::google::protobuf::Descriptor* FileDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_ExtensionRange_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_ReservedRange_reflection_ = NULL; -const ::google::protobuf::Descriptor* FieldDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FieldDescriptorProto_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor_ = NULL; -const ::google::protobuf::Descriptor* OneofDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - OneofDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumValueDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumValueDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* ServiceDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - ServiceDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* MethodDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MethodDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* FileOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileOptions_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor_ = NULL; -const ::google::protobuf::Descriptor* MessageOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MessageOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* FieldOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FieldOptions_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor_ = NULL; -const ::google::protobuf::Descriptor* EnumOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumValueOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumValueOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* ServiceOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - ServiceOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* MethodOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MethodOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* UninterpretedOption_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - UninterpretedOption_reflection_ = NULL; -const ::google::protobuf::Descriptor* UninterpretedOption_NamePart_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - UninterpretedOption_NamePart_reflection_ = NULL; -const ::google::protobuf::Descriptor* SourceCodeInfo_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - SourceCodeInfo_reflection_ = NULL; -const ::google::protobuf::Descriptor* SourceCodeInfo_Location_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - SourceCodeInfo_Location_reflection_ = NULL; -const ::google::protobuf::Descriptor* GeneratedCodeInfo_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - GeneratedCodeInfo_reflection_ = NULL; -const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - GeneratedCodeInfo_Annotation_reflection_ = NULL; +::google::protobuf::Metadata file_level_metadata[25]; +const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[6]; } // namespace -void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { - protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - const ::google::protobuf::FileDescriptor* file = - ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( - "google/protobuf/descriptor.proto"); - GOOGLE_CHECK(file != NULL); - FileDescriptorSet_descriptor_ = file->message_type(0); - static const int FileDescriptorSet_offsets_[1] = { +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() GOOGLE_ATTRIBUTE_COLD; +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() { + static const ::google::protobuf::uint32 offsets[] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, file_), - }; - FileDescriptorSet_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileDescriptorSet_descriptor_, - FileDescriptorSet::default_instance_, - FileDescriptorSet_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_[0]), - -1, - -1, - sizeof(FileDescriptorSet), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_), - -1); - FileDescriptorProto_descriptor_ = file->message_type(1); - static const int FileDescriptorProto_offsets_[12] = { + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, package_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, dependency_), @@ -138,20 +103,38 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, source_code_info_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, syntax_), - }; - FileDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileDescriptorProto_descriptor_, - FileDescriptorProto::default_instance_, - FileDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(FileDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_), - -1); - DescriptorProto_descriptor_ = file->message_type(2); - static const int DescriptorProto_offsets_[10] = { + 0, + 1, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 3, + 4, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, field_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, extension_), @@ -162,52 +145,20 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_range_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_name_), - }; - DescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_descriptor_, - DescriptorProto::default_instance_, - DescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_), - -1); - DescriptorProto_ExtensionRange_descriptor_ = DescriptorProto_descriptor_->nested_type(0); - static const int DescriptorProto_ExtensionRange_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_), - }; - DescriptorProto_ExtensionRange_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_ExtensionRange_descriptor_, - DescriptorProto_ExtensionRange::default_instance_, - DescriptorProto_ExtensionRange_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto_ExtensionRange), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_), - -1); - DescriptorProto_ReservedRange_descriptor_ = DescriptorProto_descriptor_->nested_type(1); - static const int DescriptorProto_ReservedRange_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_), - }; - DescriptorProto_ReservedRange_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_ReservedRange_descriptor_, - DescriptorProto_ReservedRange::default_instance_, - DescriptorProto_ReservedRange_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto_ReservedRange), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_), - -1); - FieldDescriptorProto_descriptor_ = file->message_type(3); - static const int FieldDescriptorProto_offsets_[10] = { + 0, + 2, + 3, + 4, + 5, + 6, + 7, + 1, + 8, + 9, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, number_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, label_), @@ -218,108 +169,74 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, oneof_index_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, json_name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, options_), - }; - FieldDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FieldDescriptorProto_descriptor_, - FieldDescriptorProto::default_instance_, - FieldDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(FieldDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_), - -1); - FieldDescriptorProto_Type_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(0); - FieldDescriptorProto_Label_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(1); - OneofDescriptorProto_descriptor_ = file->message_type(4); - static const int OneofDescriptorProto_offsets_[1] = { + 0, + 6, + 8, + 9, + 1, + 2, + 3, + 7, + 4, + 5, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, name_), - }; - OneofDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - OneofDescriptorProto_descriptor_, - OneofDescriptorProto::default_instance_, - OneofDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(OneofDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_), - -1); - EnumDescriptorProto_descriptor_ = file->message_type(5); - static const int EnumDescriptorProto_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, options_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, options_), - }; - EnumDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumDescriptorProto_descriptor_, - EnumDescriptorProto::default_instance_, - EnumDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(EnumDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_), - -1); - EnumValueDescriptorProto_descriptor_ = file->message_type(6); - static const int EnumValueDescriptorProto_offsets_[3] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, number_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, options_), - }; - EnumValueDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumValueDescriptorProto_descriptor_, - EnumValueDescriptorProto::default_instance_, - EnumValueDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(EnumValueDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_), - -1); - ServiceDescriptorProto_descriptor_ = file->message_type(7); - static const int ServiceDescriptorProto_offsets_[3] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, method_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, options_), - }; - ServiceDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - ServiceDescriptorProto_descriptor_, - ServiceDescriptorProto::default_instance_, - ServiceDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(ServiceDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_), - -1); - MethodDescriptorProto_descriptor_ = file->message_type(8); - static const int MethodDescriptorProto_offsets_[6] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, input_type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, output_type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, client_streaming_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, server_streaming_), - }; - MethodDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MethodDescriptorProto_descriptor_, - MethodDescriptorProto::default_instance_, - MethodDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(MethodDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_), - -1); - FileOptions_descriptor_ = file->message_type(9); - static const int FileOptions_offsets_[15] = { + 0, + 1, + 2, + 3, + 4, + 5, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_package_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_outer_classname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_multiple_files_), @@ -334,41 +251,42 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, cc_enable_arenas_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, objc_class_prefix_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, csharp_namespace_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, swift_prefix_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_), - }; - FileOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileOptions_descriptor_, - FileOptions::default_instance_, - FileOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_), - sizeof(FileOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_), - -1); - FileOptions_OptimizeMode_descriptor_ = FileOptions_descriptor_->enum_type(0); - MessageOptions_descriptor_ = file->message_type(10); - static const int MessageOptions_offsets_[5] = { + 0, + 1, + 6, + 7, + 8, + 14, + 2, + 9, + 10, + 11, + 12, + 13, + 3, + 4, + 5, + 15, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, message_set_wire_format_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, no_standard_descriptor_accessor_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, map_entry_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, uninterpreted_option_), - }; - MessageOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MessageOptions_descriptor_, - MessageOptions::default_instance_, - MessageOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_), - sizeof(MessageOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_), - -1); - FieldOptions_descriptor_ = file->message_type(11); - static const int FieldOptions_offsets_[7] = { + 0, + 1, + 2, + 3, + 4, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, ctype_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, packed_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, jstype_), @@ -376,87 +294,67 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, weak_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, uninterpreted_option_), - }; - FieldOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FieldOptions_descriptor_, - FieldOptions::default_instance_, - FieldOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_), - sizeof(FieldOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_), - -1); - FieldOptions_CType_descriptor_ = FieldOptions_descriptor_->enum_type(0); - FieldOptions_JSType_descriptor_ = FieldOptions_descriptor_->enum_type(1); - EnumOptions_descriptor_ = file->message_type(12); - static const int EnumOptions_offsets_[3] = { + 0, + 2, + 1, + 3, + 4, + 5, + 6, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _extensions_), + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, uninterpreted_option_), + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, allow_alias_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, uninterpreted_option_), - }; - EnumOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumOptions_descriptor_, - EnumOptions::default_instance_, - EnumOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_), - sizeof(EnumOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_), - -1); - EnumValueOptions_descriptor_ = file->message_type(13); - static const int EnumValueOptions_offsets_[2] = { + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, uninterpreted_option_), - }; - EnumValueOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumValueOptions_descriptor_, - EnumValueOptions::default_instance_, - EnumValueOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_), - sizeof(EnumValueOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_), - -1); - ServiceOptions_descriptor_ = file->message_type(14); - static const int ServiceOptions_offsets_[2] = { + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, uninterpreted_option_), - }; - ServiceOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - ServiceOptions_descriptor_, - ServiceOptions::default_instance_, - ServiceOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_), - sizeof(ServiceOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_), - -1); - MethodOptions_descriptor_ = file->message_type(15); - static const int MethodOptions_offsets_[2] = { + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, deprecated_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, idempotency_level_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, uninterpreted_option_), - }; - MethodOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MethodOptions_descriptor_, - MethodOptions::default_instance_, - MethodOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_), - sizeof(MethodOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_), - -1); - UninterpretedOption_descriptor_ = file->message_type(16); - static const int UninterpretedOption_offsets_[7] = { + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, identifier_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, positive_int_value_), @@ -464,421 +362,569 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, double_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, string_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, aggregate_value_), - }; - UninterpretedOption_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - UninterpretedOption_descriptor_, - UninterpretedOption::default_instance_, - UninterpretedOption_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_[0]), - -1, - -1, - sizeof(UninterpretedOption), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_), - -1); - UninterpretedOption_NamePart_descriptor_ = UninterpretedOption_descriptor_->nested_type(0); - static const int UninterpretedOption_NamePart_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_), - }; - UninterpretedOption_NamePart_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - UninterpretedOption_NamePart_descriptor_, - UninterpretedOption_NamePart::default_instance_, - UninterpretedOption_NamePart_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_[0]), - -1, - -1, - sizeof(UninterpretedOption_NamePart), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_), - -1); - SourceCodeInfo_descriptor_ = file->message_type(17); - static const int SourceCodeInfo_offsets_[1] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_), - }; - SourceCodeInfo_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - SourceCodeInfo_descriptor_, - SourceCodeInfo::default_instance_, - SourceCodeInfo_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_[0]), - -1, - -1, - sizeof(SourceCodeInfo), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_), - -1); - SourceCodeInfo_Location_descriptor_ = SourceCodeInfo_descriptor_->nested_type(0); - static const int SourceCodeInfo_Location_offsets_[5] = { + 6, + 0, + 3, + 4, + 5, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, path_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, span_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_comments_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, trailing_comments_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_detached_comments_), - }; - SourceCodeInfo_Location_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - SourceCodeInfo_Location_descriptor_, - SourceCodeInfo_Location::default_instance_, - SourceCodeInfo_Location_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_[0]), - -1, - -1, - sizeof(SourceCodeInfo_Location), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_), - -1); - GeneratedCodeInfo_descriptor_ = file->message_type(18); - static const int GeneratedCodeInfo_offsets_[1] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_), - }; - GeneratedCodeInfo_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - GeneratedCodeInfo_descriptor_, - GeneratedCodeInfo::default_instance_, - GeneratedCodeInfo_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_[0]), - -1, - -1, - sizeof(GeneratedCodeInfo), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_), - -1); - GeneratedCodeInfo_Annotation_descriptor_ = GeneratedCodeInfo_descriptor_->nested_type(0); - static const int GeneratedCodeInfo_Annotation_offsets_[4] = { + 2, + 3, + 0, + 1, + 4, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_), + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, path_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, source_file_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, begin_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, end_), + 3, + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_), + 0, }; - GeneratedCodeInfo_Annotation_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - GeneratedCodeInfo_Annotation_descriptor_, - GeneratedCodeInfo_Annotation::default_instance_, - GeneratedCodeInfo_Annotation_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_[0]), - -1, - -1, - sizeof(GeneratedCodeInfo_Annotation), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_), - -1); -} + return offsets; +} + +static const ::google::protobuf::internal::MigrationSchema schemas[] = { + { 0, 5, sizeof(FileDescriptorSet)}, + { 6, 22, sizeof(FileDescriptorProto)}, + { 34, 40, sizeof(DescriptorProto_ExtensionRange)}, + { 42, 48, sizeof(DescriptorProto_ReservedRange)}, + { 50, 64, sizeof(DescriptorProto)}, + { 74, 88, sizeof(FieldDescriptorProto)}, + { 98, 104, sizeof(OneofDescriptorProto)}, + { 106, 113, sizeof(EnumDescriptorProto)}, + { 116, 123, sizeof(EnumValueDescriptorProto)}, + { 126, 133, sizeof(ServiceDescriptorProto)}, + { 136, 146, sizeof(MethodDescriptorProto)}, + { 152, 172, sizeof(FileOptions)}, + { 188, 197, sizeof(MessageOptions)}, + { 202, 213, sizeof(FieldOptions)}, + { 220, 225, sizeof(OneofOptions)}, + { 226, 233, sizeof(EnumOptions)}, + { 236, 242, sizeof(EnumValueOptions)}, + { 244, 250, sizeof(ServiceOptions)}, + { 252, 259, sizeof(MethodOptions)}, + { 262, 268, sizeof(UninterpretedOption_NamePart)}, + { 270, 281, sizeof(UninterpretedOption)}, + { 288, 297, sizeof(SourceCodeInfo_Location)}, + { 302, 307, sizeof(SourceCodeInfo)}, + { 308, 316, sizeof(GeneratedCodeInfo_Annotation)}, + { 320, 325, sizeof(GeneratedCodeInfo)}, +}; + +static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = { + {reinterpret_cast(&_FileDescriptorSet_default_instance_), NULL}, + {reinterpret_cast(&_FileDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_ExtensionRange_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_ReservedRange_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_FieldDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_OneofDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_EnumDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_EnumValueDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_ServiceDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_MethodDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_FileOptions_default_instance_), NULL}, + {reinterpret_cast(&_MessageOptions_default_instance_), NULL}, + {reinterpret_cast(&_FieldOptions_default_instance_), NULL}, + {reinterpret_cast(&_OneofOptions_default_instance_), NULL}, + {reinterpret_cast(&_EnumOptions_default_instance_), NULL}, + {reinterpret_cast(&_EnumValueOptions_default_instance_), NULL}, + {reinterpret_cast(&_ServiceOptions_default_instance_), NULL}, + {reinterpret_cast(&_MethodOptions_default_instance_), NULL}, + {reinterpret_cast(&_UninterpretedOption_NamePart_default_instance_), NULL}, + {reinterpret_cast(&_UninterpretedOption_default_instance_), NULL}, + {reinterpret_cast(&_SourceCodeInfo_Location_default_instance_), NULL}, + {reinterpret_cast(&_SourceCodeInfo_default_instance_), NULL}, + {reinterpret_cast(&_GeneratedCodeInfo_Annotation_default_instance_), NULL}, + {reinterpret_cast(&_GeneratedCodeInfo_default_instance_), NULL}, +}; namespace { -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); -inline void protobuf_AssignDescriptorsOnce() { - ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, - &protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto); +void protobuf_AssignDescriptors() { + protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); + ::google::protobuf::MessageFactory* factory = NULL; + AssignDescriptors( + "google/protobuf/descriptor.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto(), factory, + file_level_metadata, file_level_enum_descriptors, NULL); +} + +void protobuf_AssignDescriptorsOnce() { + static GOOGLE_PROTOBUF_DECLARE_ONCE(once); + ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors); } +void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD; void protobuf_RegisterTypes(const ::std::string&) { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileDescriptorSet_descriptor_, &FileDescriptorSet::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileDescriptorProto_descriptor_, &FileDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_descriptor_, &DescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_ExtensionRange_descriptor_, &DescriptorProto_ExtensionRange::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_ReservedRange_descriptor_, &DescriptorProto_ReservedRange::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FieldDescriptorProto_descriptor_, &FieldDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - OneofDescriptorProto_descriptor_, &OneofDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumDescriptorProto_descriptor_, &EnumDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumValueDescriptorProto_descriptor_, &EnumValueDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - ServiceDescriptorProto_descriptor_, &ServiceDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MethodDescriptorProto_descriptor_, &MethodDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileOptions_descriptor_, &FileOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MessageOptions_descriptor_, &MessageOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FieldOptions_descriptor_, &FieldOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumOptions_descriptor_, &EnumOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumValueOptions_descriptor_, &EnumValueOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - ServiceOptions_descriptor_, &ServiceOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MethodOptions_descriptor_, &MethodOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - UninterpretedOption_descriptor_, &UninterpretedOption::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - UninterpretedOption_NamePart_descriptor_, &UninterpretedOption_NamePart::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - SourceCodeInfo_descriptor_, &SourceCodeInfo::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - SourceCodeInfo_Location_descriptor_, &SourceCodeInfo_Location::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - GeneratedCodeInfo_descriptor_, &GeneratedCodeInfo::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - GeneratedCodeInfo_Annotation_descriptor_, &GeneratedCodeInfo_Annotation::default_instance()); + ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 25); } } // namespace void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto() { - delete FileDescriptorSet::default_instance_; - delete FileDescriptorSet_reflection_; - delete FileDescriptorProto::default_instance_; - delete FileDescriptorProto_reflection_; - delete DescriptorProto::default_instance_; - delete DescriptorProto_reflection_; - delete DescriptorProto_ExtensionRange::default_instance_; - delete DescriptorProto_ExtensionRange_reflection_; - delete DescriptorProto_ReservedRange::default_instance_; - delete DescriptorProto_ReservedRange_reflection_; - delete FieldDescriptorProto::default_instance_; - delete FieldDescriptorProto_reflection_; - delete OneofDescriptorProto::default_instance_; - delete OneofDescriptorProto_reflection_; - delete EnumDescriptorProto::default_instance_; - delete EnumDescriptorProto_reflection_; - delete EnumValueDescriptorProto::default_instance_; - delete EnumValueDescriptorProto_reflection_; - delete ServiceDescriptorProto::default_instance_; - delete ServiceDescriptorProto_reflection_; - delete MethodDescriptorProto::default_instance_; - delete MethodDescriptorProto_reflection_; - delete FileOptions::default_instance_; - delete FileOptions_reflection_; - delete MessageOptions::default_instance_; - delete MessageOptions_reflection_; - delete FieldOptions::default_instance_; - delete FieldOptions_reflection_; - delete EnumOptions::default_instance_; - delete EnumOptions_reflection_; - delete EnumValueOptions::default_instance_; - delete EnumValueOptions_reflection_; - delete ServiceOptions::default_instance_; - delete ServiceOptions_reflection_; - delete MethodOptions::default_instance_; - delete MethodOptions_reflection_; - delete UninterpretedOption::default_instance_; - delete UninterpretedOption_reflection_; - delete UninterpretedOption_NamePart::default_instance_; - delete UninterpretedOption_NamePart_reflection_; - delete SourceCodeInfo::default_instance_; - delete SourceCodeInfo_reflection_; - delete SourceCodeInfo_Location::default_instance_; - delete SourceCodeInfo_Location_reflection_; - delete GeneratedCodeInfo::default_instance_; - delete GeneratedCodeInfo_reflection_; - delete GeneratedCodeInfo_Annotation::default_instance_; - delete GeneratedCodeInfo_Annotation_reflection_; -} - -void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { - static bool already_here = false; - if (already_here) return; - already_here = true; + _FileDescriptorSet_default_instance_.Shutdown(); + delete file_level_metadata[0].reflection; + _FileDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[1].reflection; + _DescriptorProto_ExtensionRange_default_instance_.Shutdown(); + delete file_level_metadata[2].reflection; + _DescriptorProto_ReservedRange_default_instance_.Shutdown(); + delete file_level_metadata[3].reflection; + _DescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[4].reflection; + _FieldDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[5].reflection; + _OneofDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[6].reflection; + _EnumDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[7].reflection; + _EnumValueDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[8].reflection; + _ServiceDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[9].reflection; + _MethodDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[10].reflection; + _FileOptions_default_instance_.Shutdown(); + delete file_level_metadata[11].reflection; + _MessageOptions_default_instance_.Shutdown(); + delete file_level_metadata[12].reflection; + _FieldOptions_default_instance_.Shutdown(); + delete file_level_metadata[13].reflection; + _OneofOptions_default_instance_.Shutdown(); + delete file_level_metadata[14].reflection; + _EnumOptions_default_instance_.Shutdown(); + delete file_level_metadata[15].reflection; + _EnumValueOptions_default_instance_.Shutdown(); + delete file_level_metadata[16].reflection; + _ServiceOptions_default_instance_.Shutdown(); + delete file_level_metadata[17].reflection; + _MethodOptions_default_instance_.Shutdown(); + delete file_level_metadata[18].reflection; + _UninterpretedOption_NamePart_default_instance_.Shutdown(); + delete file_level_metadata[19].reflection; + _UninterpretedOption_default_instance_.Shutdown(); + delete file_level_metadata[20].reflection; + _SourceCodeInfo_Location_default_instance_.Shutdown(); + delete file_level_metadata[21].reflection; + _SourceCodeInfo_default_instance_.Shutdown(); + delete file_level_metadata[22].reflection; + _GeneratedCodeInfo_Annotation_default_instance_.Shutdown(); + delete file_level_metadata[23].reflection; + _GeneratedCodeInfo_default_instance_.Shutdown(); + delete file_level_metadata[24].reflection; +} + +void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl() { GOOGLE_PROTOBUF_VERIFY_VERSION; + ::google::protobuf::internal::InitProtobufDefaults(); + _FileDescriptorSet_default_instance_.DefaultConstruct(); + _FileDescriptorProto_default_instance_.DefaultConstruct(); + _DescriptorProto_ExtensionRange_default_instance_.DefaultConstruct(); + _DescriptorProto_ReservedRange_default_instance_.DefaultConstruct(); + _DescriptorProto_default_instance_.DefaultConstruct(); + _FieldDescriptorProto_default_instance_.DefaultConstruct(); + _OneofDescriptorProto_default_instance_.DefaultConstruct(); + _EnumDescriptorProto_default_instance_.DefaultConstruct(); + _EnumValueDescriptorProto_default_instance_.DefaultConstruct(); + _ServiceDescriptorProto_default_instance_.DefaultConstruct(); + _MethodDescriptorProto_default_instance_.DefaultConstruct(); + _FileOptions_default_instance_.DefaultConstruct(); + _MessageOptions_default_instance_.DefaultConstruct(); + _FieldOptions_default_instance_.DefaultConstruct(); + _OneofOptions_default_instance_.DefaultConstruct(); + _EnumOptions_default_instance_.DefaultConstruct(); + _EnumValueOptions_default_instance_.DefaultConstruct(); + _ServiceOptions_default_instance_.DefaultConstruct(); + _MethodOptions_default_instance_.DefaultConstruct(); + _UninterpretedOption_NamePart_default_instance_.DefaultConstruct(); + _UninterpretedOption_default_instance_.DefaultConstruct(); + _SourceCodeInfo_Location_default_instance_.DefaultConstruct(); + _SourceCodeInfo_default_instance_.DefaultConstruct(); + _GeneratedCodeInfo_Annotation_default_instance_.DefaultConstruct(); + _GeneratedCodeInfo_default_instance_.DefaultConstruct(); + _FileDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FileOptions*>( + ::google::protobuf::FileOptions::internal_default_instance()); + _FileDescriptorProto_default_instance_.get_mutable()->source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>( + ::google::protobuf::SourceCodeInfo::internal_default_instance()); + _DescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MessageOptions*>( + ::google::protobuf::MessageOptions::internal_default_instance()); + _FieldDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FieldOptions*>( + ::google::protobuf::FieldOptions::internal_default_instance()); + _OneofDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::OneofOptions*>( + ::google::protobuf::OneofOptions::internal_default_instance()); + _EnumDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumOptions*>( + ::google::protobuf::EnumOptions::internal_default_instance()); + _EnumValueDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumValueOptions*>( + ::google::protobuf::EnumValueOptions::internal_default_instance()); + _ServiceDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::ServiceOptions*>( + ::google::protobuf::ServiceOptions::internal_default_instance()); + _MethodDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MethodOptions*>( + ::google::protobuf::MethodOptions::internal_default_instance()); +} + +void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto() { + static GOOGLE_PROTOBUF_DECLARE_ONCE(once); + ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl); +} +void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + static const char descriptor[] = { + "\n google/protobuf/descriptor.proto\022\017goog" + "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file" + "\030\001 \003(\0132$.google.protobuf.FileDescriptorP" + "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001" + "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022" + "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen" + "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog" + "le.protobuf.DescriptorProto\0227\n\tenum_type" + "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP" + "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf." + "ServiceDescriptorProto\0228\n\textension\030\007 \003(" + "\0132%.google.protobuf.FieldDescriptorProto" + "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File" + "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog" + "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001" + "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005" + "field\030\002 \003(\0132%.google.protobuf.FieldDescr" + "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p" + "rotobuf.FieldDescriptorProto\0225\n\013nested_t" + "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr" + "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf" + ".EnumDescriptorProto\022H\n\017extension_range\030" + "\005 \003(\0132/.google.protobuf.DescriptorProto." + "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo" + "gle.protobuf.OneofDescriptorProto\0220\n\007opt" + "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti" + "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro" + "tobuf.DescriptorProto.ReservedRange\022\025\n\rr" + "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005" + "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang" + "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD" + "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003" + " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi" + "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*" + ".google.protobuf.FieldDescriptorProto.Ty" + "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022" + "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t " + "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132" + "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022" + "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE" + "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020" + "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n" + "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR" + "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022" + "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_" + "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI" + "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE" + "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE" + "L_REPEATED\020\003\"T\n\024OneofDescriptorProto\022\014\n\004" + "name\030\001 \001(\t\022.\n\007options\030\002 \001(\0132\035.google.pro" + "tobuf.OneofOptions\"\214\001\n\023EnumDescriptorPro" + "to\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google" + ".protobuf.EnumValueDescriptorProto\022-\n\007op" + "tions\030\003 \001(\0132\034.google.protobuf.EnumOption" + "s\"l\n\030EnumValueDescriptorProto\022\014\n\004name\030\001 " + "\001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.g" + "oogle.protobuf.EnumValueOptions\"\220\001\n\026Serv" + "iceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006meth" + "od\030\002 \003(\0132&.google.protobuf.MethodDescrip" + "torProto\0220\n\007options\030\003 \001(\0132\037.google.proto" + "buf.ServiceOptions\"\301\001\n\025MethodDescriptorP" + "roto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023" + "\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g" + "oogle.protobuf.MethodOptions\022\037\n\020client_s" + "treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin" + "g\030\006 \001(\010:\005false\"\232\005\n\013FileOptions\022\024\n\014java_p" + "ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001" + "(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)" + "\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030" + "\001\022%\n\026java_string_check_utf8\030\033 \001(\010:\005false" + "\022F\n\014optimize_for\030\t \001(\0162).google.protobuf" + ".FileOptions.OptimizeMode:\005SPEED\022\022\n\ngo_p" + "ackage\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(" + "\010:\005false\022$\n\025java_generic_services\030\021 \001(\010:" + "\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal" + "se\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enab" + "le_arenas\030\037 \001(\010:\005false\022\031\n\021objc_class_pre" + "fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014s" + "wift_prefix\030\' \001(\t\022C\n\024uninterpreted_optio" + "n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted" + "Option\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCOD" + "E_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010" + "&\020\'\"\354\001\n\016MessageOptions\022&\n\027message_set_wi" + "re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de" + "scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec" + "ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024" + "uninterpreted_option\030\347\007 \003(\0132$.google.pro" + "tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\010" + "\020\t\"\236\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.goo" + "gle.protobuf.FieldOptions.CType:\006STRING\022" + "\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google" + ".protobuf.FieldOptions.JSType:\tJS_NORMAL" + "\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(" + "\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninter" + "preted_option\030\347\007 \003(\0132$.google.protobuf.U" + "ninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000\022" + "\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n" + "\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER" + "\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014OneofOptions\022C\n\024u" + "ninterpreted_option\030\347\007 \003(\0132$.google.prot" + "obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013" + "EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr" + "ecated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opt" + "ion\030\347\007 \003(\0132$.google.protobuf.Uninterpret" + "edOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022" + "\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpre" + "ted_option\030\347\007 \003(\0132$.google.protobuf.Unin" + "terpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpt" + "ions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024unint" + "erpreted_option\030\347\007 \003(\0132$.google.protobuf" + ".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMeth" + "odOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021" + "idempotency_level\030\" \001(\0162/.google.protobu" + "f.MethodOptions.IdempotencyLevel:\023IDEMPO" + "TENCY_UNKNOWN\022C\n\024uninterpreted_option\030\347\007" + " \003(\0132$.google.protobuf.UninterpretedOpti" + "on\"P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UN" + "KNOWN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTE" + "NT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022" + ";\n\004name\030\002 \003(\0132-.google.protobuf.Uninterp" + "retedOption.NamePart\022\030\n\020identifier_value" + "\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022ne" + "gative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006" + " \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_" + "value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002" + "(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeI" + "nfo\022:\n\010location\030\001 \003(\0132(.google.protobuf." + "SourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004" + "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead" + "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030" + "\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t" + "\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003" + "(\0132-.google.protobuf.GeneratedCodeInfo.A" + "nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020" + "\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n" + "\003end\030\004 \001(\005B\214\001\n\023com.google.protobufB\020Desc" + "riptorProtosH\001Z>github.com/golang/protob" + "uf/protoc-gen-go/descriptor;descriptor\242\002" + "\003GPB\252\002\032Google.Protobuf.Reflection" + }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n google/protobuf/descriptor.proto\022\017goog" - "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file" - "\030\001 \003(\0132$.google.protobuf.FileDescriptorP" - "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001" - "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022" - "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen" - "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog" - "le.protobuf.DescriptorProto\0227\n\tenum_type" - "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP" - "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf." - "ServiceDescriptorProto\0228\n\textension\030\007 \003(" - "\0132%.google.protobuf.FieldDescriptorProto" - "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File" - "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog" - "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001" - "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005" - "field\030\002 \003(\0132%.google.protobuf.FieldDescr" - "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p" - "rotobuf.FieldDescriptorProto\0225\n\013nested_t" - "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr" - "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf" - ".EnumDescriptorProto\022H\n\017extension_range\030" - "\005 \003(\0132/.google.protobuf.DescriptorProto." - "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo" - "gle.protobuf.OneofDescriptorProto\0220\n\007opt" - "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti" - "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro" - "tobuf.DescriptorProto.ReservedRange\022\025\n\rr" - "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005" - "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang" - "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD" - "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003" - " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi" - "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*" - ".google.protobuf.FieldDescriptorProto.Ty" - "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022" - "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t " - "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132" - "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022" - "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE" - "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020" - "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n" - "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR" - "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022" - "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_" - "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI" - "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE" - "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE" - "L_REPEATED\020\003\"$\n\024OneofDescriptorProto\022\014\n\004" - "name\030\001 \001(\t\"\214\001\n\023EnumDescriptorProto\022\014\n\004na" - "me\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google.protobu" - "f.EnumValueDescriptorProto\022-\n\007options\030\003 " - "\001(\0132\034.google.protobuf.EnumOptions\"l\n\030Enu" - "mValueDescriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006n" - "umber\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.google.pr" - "otobuf.EnumValueOptions\"\220\001\n\026ServiceDescr" - "iptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006method\030\002 \003(\013" - "2&.google.protobuf.MethodDescriptorProto" - "\0220\n\007options\030\003 \001(\0132\037.google.protobuf.Serv" - "iceOptions\"\301\001\n\025MethodDescriptorProto\022\014\n\004" - "name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023\n\013output" - "_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.google.pr" - "otobuf.MethodOptions\022\037\n\020client_streaming" - "\030\005 \001(\010:\005false\022\037\n\020server_streaming\030\006 \001(\010:" - "\005false\"\207\005\n\013FileOptions\022\024\n\014java_package\030\001" - " \001(\t\022\034\n\024java_outer_classname\030\010 \001(\t\022\"\n\023ja" - "va_multiple_files\030\n \001(\010:\005false\022,\n\035java_g" - "enerate_equals_and_hash\030\024 \001(\010:\005false\022%\n\026" - "java_string_check_utf8\030\033 \001(\010:\005false\022F\n\014o" - "ptimize_for\030\t \001(\0162).google.protobuf.File" - "Options.OptimizeMode:\005SPEED\022\022\n\ngo_packag" - "e\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(\010:\005fa" - "lse\022$\n\025java_generic_services\030\021 \001(\010:\005fals" - "e\022\"\n\023py_generic_services\030\022 \001(\010:\005false\022\031\n" - "\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enable_ar" - "enas\030\037 \001(\010:\005false\022\031\n\021objc_class_prefix\030$" - " \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024uninte" - "rpreted_option\030\347\007 \003(\0132$.google.protobuf." - "UninterpretedOption\":\n\014OptimizeMode\022\t\n\005S" - "PEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*" - "\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\346\001\n\016MessageOptions\022&\n\027m" - "essage_set_wire_format\030\001 \001(\010:\005false\022.\n\037n" - "o_standard_descriptor_accessor\030\002 \001(\010:\005fa" - "lse\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tmap_en" - "try\030\007 \001(\010\022C\n\024uninterpreted_option\030\347\007 \003(\013" - "2$.google.protobuf.UninterpretedOption*\t" - "\010\350\007\020\200\200\200\200\002\"\230\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(" - "\0162#.google.protobuf.FieldOptions.CType:\006" - "STRING\022\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$" - ".google.protobuf.FieldOptions.JSType:\tJS" - "_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecat" - "ed\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024" - "uninterpreted_option\030\347\007 \003(\0132$.google.pro" - "tobuf.UninterpretedOption\"/\n\005CType\022\n\n\006ST" - "RING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JS" - "Type\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS" - "_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013" - "allow_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005f" - "alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go" - "ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200" - "\200\200\200\002\"}\n\020EnumValueOptions\022\031\n\ndeprecated\030\001" - " \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003" - "(\0132$.google.protobuf.UninterpretedOption" - "*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndepreca" - "ted\030! \001(\010:\005false\022C\n\024uninterpreted_option" - "\030\347\007 \003(\0132$.google.protobuf.UninterpretedO" - "ption*\t\010\350\007\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndep" - "recated\030! \001(\010:\005false\022C\n\024uninterpreted_op" - "tion\030\347\007 \003(\0132$.google.protobuf.Uninterpre" - "tedOption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOp" - "tion\022;\n\004name\030\002 \003(\0132-.google.protobuf.Uni" - "nterpretedOption.NamePart\022\030\n\020identifier_" - "value\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022" - "\032\n\022negative_int_value\030\005 \001(\003\022\024\n\014double_va" - "lue\030\006 \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggre" - "gate_value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_par" - "t\030\001 \002(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016Source" - "CodeInfo\022:\n\010location\030\001 \003(\0132(.google.prot" - "obuf.SourceCodeInfo.Location\032\206\001\n\010Locatio" - "n\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n" - "\020leading_comments\030\003 \001(\t\022\031\n\021trailing_comm" - "ents\030\004 \001(\t\022!\n\031leading_detached_comments\030" - "\006 \003(\t\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotatio" - "n\030\001 \003(\0132-.google.protobuf.GeneratedCodeI" - "nfo.Annotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003" - "(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001" - "(\005\022\013\n\003end\030\004 \001(\005BX\n\023com.google.protobufB\020" - "DescriptorProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032G" - "oogle.Protobuf.Reflection", 5145); + descriptor, 5553); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/descriptor.proto", &protobuf_RegisterTypes); - FileDescriptorSet::default_instance_ = new FileDescriptorSet(); - FileDescriptorProto::default_instance_ = new FileDescriptorProto(); - DescriptorProto::default_instance_ = new DescriptorProto(); - DescriptorProto_ExtensionRange::default_instance_ = new DescriptorProto_ExtensionRange(); - DescriptorProto_ReservedRange::default_instance_ = new DescriptorProto_ReservedRange(); - FieldDescriptorProto::default_instance_ = new FieldDescriptorProto(); - OneofDescriptorProto::default_instance_ = new OneofDescriptorProto(); - EnumDescriptorProto::default_instance_ = new EnumDescriptorProto(); - EnumValueDescriptorProto::default_instance_ = new EnumValueDescriptorProto(); - ServiceDescriptorProto::default_instance_ = new ServiceDescriptorProto(); - MethodDescriptorProto::default_instance_ = new MethodDescriptorProto(); - FileOptions::default_instance_ = new FileOptions(); - MessageOptions::default_instance_ = new MessageOptions(); - FieldOptions::default_instance_ = new FieldOptions(); - EnumOptions::default_instance_ = new EnumOptions(); - EnumValueOptions::default_instance_ = new EnumValueOptions(); - ServiceOptions::default_instance_ = new ServiceOptions(); - MethodOptions::default_instance_ = new MethodOptions(); - UninterpretedOption::default_instance_ = new UninterpretedOption(); - UninterpretedOption_NamePart::default_instance_ = new UninterpretedOption_NamePart(); - SourceCodeInfo::default_instance_ = new SourceCodeInfo(); - SourceCodeInfo_Location::default_instance_ = new SourceCodeInfo_Location(); - GeneratedCodeInfo::default_instance_ = new GeneratedCodeInfo(); - GeneratedCodeInfo_Annotation::default_instance_ = new GeneratedCodeInfo_Annotation(); - FileDescriptorSet::default_instance_->InitAsDefaultInstance(); - FileDescriptorProto::default_instance_->InitAsDefaultInstance(); - DescriptorProto::default_instance_->InitAsDefaultInstance(); - DescriptorProto_ExtensionRange::default_instance_->InitAsDefaultInstance(); - DescriptorProto_ReservedRange::default_instance_->InitAsDefaultInstance(); - FieldDescriptorProto::default_instance_->InitAsDefaultInstance(); - OneofDescriptorProto::default_instance_->InitAsDefaultInstance(); - EnumDescriptorProto::default_instance_->InitAsDefaultInstance(); - EnumValueDescriptorProto::default_instance_->InitAsDefaultInstance(); - ServiceDescriptorProto::default_instance_->InitAsDefaultInstance(); - MethodDescriptorProto::default_instance_->InitAsDefaultInstance(); - FileOptions::default_instance_->InitAsDefaultInstance(); - MessageOptions::default_instance_->InitAsDefaultInstance(); - FieldOptions::default_instance_->InitAsDefaultInstance(); - EnumOptions::default_instance_->InitAsDefaultInstance(); - EnumValueOptions::default_instance_->InitAsDefaultInstance(); - ServiceOptions::default_instance_->InitAsDefaultInstance(); - MethodOptions::default_instance_->InitAsDefaultInstance(); - UninterpretedOption::default_instance_->InitAsDefaultInstance(); - UninterpretedOption_NamePart::default_instance_->InitAsDefaultInstance(); - SourceCodeInfo::default_instance_->InitAsDefaultInstance(); - SourceCodeInfo_Location::default_instance_->InitAsDefaultInstance(); - GeneratedCodeInfo::default_instance_->InitAsDefaultInstance(); - GeneratedCodeInfo_Annotation::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto); } +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_); +void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { + ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_, + &protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl); +} // Force AddDescriptors() to be called at static initialization time. struct StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto { StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto() { protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); } } static_descriptor_initializer_google_2fprotobuf_2fdescriptor_2eproto_; +const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[0]; +} +bool FieldDescriptorProto_Type_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + return true; + default: + return false; + } +} -namespace { +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64; +const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN; +const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX; +const int FieldDescriptorProto::Type_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[1]; +} +bool FieldDescriptorProto_Label_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + return true; + default: + return false; + } +} + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL; +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED; +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED; +const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN; +const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX; +const int FieldDescriptorProto::Label_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[2]; +} +bool FileOptions_OptimizeMode_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + return true; + default: + return false; + } +} -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD; -static void MergeFromFail(int line) { - GOOGLE_CHECK(false) << __FILE__ << ":" << line; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FileOptions_OptimizeMode FileOptions::SPEED; +const FileOptions_OptimizeMode FileOptions::CODE_SIZE; +const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME; +const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN; +const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX; +const int FileOptions::OptimizeMode_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[3]; +} +bool FieldOptions_CType_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } } -} // namespace +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldOptions_CType FieldOptions::STRING; +const FieldOptions_CType FieldOptions::CORD; +const FieldOptions_CType FieldOptions::STRING_PIECE; +const FieldOptions_CType FieldOptions::CType_MIN; +const FieldOptions_CType FieldOptions::CType_MAX; +const int FieldOptions::CType_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[4]; +} +bool FieldOptions_JSType_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } +} + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldOptions_JSType FieldOptions::JS_NORMAL; +const FieldOptions_JSType FieldOptions::JS_STRING; +const FieldOptions_JSType FieldOptions::JS_NUMBER; +const FieldOptions_JSType FieldOptions::JSType_MIN; +const FieldOptions_JSType FieldOptions::JSType_MAX; +const int FieldOptions::JSType_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[5]; +} +bool MethodOptions_IdempotencyLevel_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENCY_UNKNOWN; +const MethodOptions_IdempotencyLevel MethodOptions::NO_SIDE_EFFECTS; +const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENT; +const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MIN; +const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MAX; +const int MethodOptions::IdempotencyLevel_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 // =================================================================== @@ -888,24 +934,24 @@ const int FileDescriptorSet::kFileFieldNumber; FileDescriptorSet::FileDescriptorSet() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorSet) } - -void FileDescriptorSet::InitAsDefaultInstance() { -} - FileDescriptorSet::FileDescriptorSet(const FileDescriptorSet& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + file_(from.file_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet) } void FileDescriptorSet::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } FileDescriptorSet::~FileDescriptorSet() { @@ -914,8 +960,6 @@ FileDescriptorSet::~FileDescriptorSet() { } void FileDescriptorSet::SharedDtor() { - if (this != default_instance_) { - } } void FileDescriptorSet::SetCachedSize(int size) const { @@ -925,16 +969,14 @@ void FileDescriptorSet::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileDescriptorSet::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileDescriptorSet_descriptor_; + return file_level_metadata[0].descriptor; } const FileDescriptorSet& FileDescriptorSet::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileDescriptorSet* FileDescriptorSet::default_instance_ = NULL; - FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) const { FileDescriptorSet* n = new FileDescriptorSet; if (arena != NULL) { @@ -946,10 +988,8 @@ FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) cons void FileDescriptorSet::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet) file_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileDescriptorSet::MergePartialFromCodedStream( @@ -958,23 +998,20 @@ bool FileDescriptorSet::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorSet) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated .google.protobuf.FileDescriptorProto file = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(input->IncrementRecursionDepth()); - parse_loop_file: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_file())); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_file; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -1016,14 +1053,15 @@ void FileDescriptorSet::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorSet) } -::google::protobuf::uint8* FileDescriptorSet::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileDescriptorSet::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorSet) // repeated .google.protobuf.FileDescriptorProto file = 1; for (unsigned int i = 0, n = this->file_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->file(i), target); + InternalWriteMessageNoVirtualToArray( + 1, this->file(i), false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -1034,33 +1072,37 @@ ::google::protobuf::uint8* FileDescriptorSet::SerializeWithCachedSizesToArray( return target; } -int FileDescriptorSet::ByteSize() const { +size_t FileDescriptorSet::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorSet) - int total_size = 0; - - // repeated .google.protobuf.FileDescriptorProto file = 1; - total_size += 1 * this->file_size(); - for (int i = 0; i < this->file_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->file(i)); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.FileDescriptorProto file = 1; + { + unsigned int count = this->file_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->file(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorSet) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileDescriptorSet* source = + GOOGLE_DCHECK_NE(&from, this); + const FileDescriptorSet* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -1074,11 +1116,9 @@ void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) { void FileDescriptorSet::MergeFrom(const FileDescriptorSet& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorSet) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); file_.MergeFrom(from.file_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FileDescriptorSet::CopyFrom(const ::google::protobuf::Message& from) { @@ -1096,7 +1136,6 @@ void FileDescriptorSet::CopyFrom(const FileDescriptorSet& from) { } bool FileDescriptorSet::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->file())) return false; return true; } @@ -1114,10 +1153,7 @@ void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) { ::google::protobuf::Metadata FileDescriptorSet::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileDescriptorSet_descriptor_; - metadata.reflection = FileDescriptorSet_reflection_; - return metadata; + return file_level_metadata[0]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -1174,32 +1210,57 @@ const int FileDescriptorProto::kSyntaxFieldNumber; FileDescriptorProto::FileDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorProto) } - -void FileDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::FileOptions*>(&::google::protobuf::FileOptions::default_instance()); - source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>(&::google::protobuf::SourceCodeInfo::default_instance()); -} - FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + dependency_(from.dependency_), + public_dependency_(from.public_dependency_), + weak_dependency_(from.weak_dependency_), + message_type_(from.message_type_), + enum_type_(from.enum_type_), + service_(from.service_), + extension_(from.extension_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_package()) { + package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_); + } + syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_syntax()) { + syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::FileOptions(*from.options_); + } else { + options_ = NULL; + } + if (from.has_source_code_info()) { + source_code_info_ = new ::google::protobuf::SourceCodeInfo(*from.source_code_info_); + } else { + source_code_info_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorProto) } void FileDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - source_code_info_ = NULL; syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&source_code_info_) - + reinterpret_cast(&options_) + sizeof(source_code_info_)); } FileDescriptorProto::~FileDescriptorProto() { @@ -1211,8 +1272,10 @@ void FileDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); syntax_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; + } + if (this != internal_default_instance()) { delete source_code_info_; } } @@ -1224,16 +1287,14 @@ void FileDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileDescriptorProto_descriptor_; + return file_level_metadata[1].descriptor; } const FileDescriptorProto& FileDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileDescriptorProto* FileDescriptorProto::default_instance_ = NULL; - FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) const { FileDescriptorProto* n = new FileDescriptorProto; if (arena != NULL) { @@ -1244,36 +1305,37 @@ FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) void FileDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto) - if (_has_bits_[0 / 32] & 3u) { + dependency_.Clear(); + public_dependency_.Clear(); + weak_dependency_.Clear(); + message_type_.Clear(); + enum_type_.Clear(); + service_.Clear(); + extension_.Clear(); + if (_has_bits_[0 / 32] & 31u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_package()) { - package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*package_.UnsafeRawStringPointer())->clear(); + } + if (has_syntax()) { + GOOGLE_DCHECK(!syntax_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*syntax_.UnsafeRawStringPointer())->clear(); } - } - if (_has_bits_[8 / 32] & 3584u) { if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::FileOptions::Clear(); } if (has_source_code_info()) { - if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); - } - if (has_syntax()) { - syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(source_code_info_ != NULL); + source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); } } - dependency_.Clear(); - public_dependency_.Clear(); - weak_dependency_.Clear(); - message_type_.Clear(); - enum_type_.Clear(); - service_.Clear(); - extension_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileDescriptorProto::MergePartialFromCodedStream( @@ -1282,13 +1344,13 @@ bool FileDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1298,14 +1360,12 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_package; break; } // optional string package = 2; case 2: { - if (tag == 18) { - parse_package: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1315,14 +1375,12 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_dependency; break; } // repeated string dependency = 3; case 3: { - if (tag == 26) { - parse_dependency: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_dependency())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1333,144 +1391,118 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_dependency; - if (input->ExpectTag(34)) goto parse_message_type; break; } // repeated .google.protobuf.DescriptorProto message_type = 4; case 4: { - if (tag == 34) { - parse_message_type: + if (tag == 34u) { DO_(input->IncrementRecursionDepth()); - parse_loop_message_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_message_type())); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_loop_message_type; - if (input->ExpectTag(42)) goto parse_loop_enum_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; case 5: { - if (tag == 42) { + if (tag == 42u) { DO_(input->IncrementRecursionDepth()); - parse_loop_enum_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_enum_type())); } else { goto handle_unusual; } - if (input->ExpectTag(42)) goto parse_loop_enum_type; - if (input->ExpectTag(50)) goto parse_loop_service; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.ServiceDescriptorProto service = 6; case 6: { - if (tag == 50) { + if (tag == 50u) { DO_(input->IncrementRecursionDepth()); - parse_loop_service: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_service())); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_loop_service; - if (input->ExpectTag(58)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.FieldDescriptorProto extension = 7; case 7: { - if (tag == 58) { + if (tag == 58u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension())); } else { goto handle_unusual; } - if (input->ExpectTag(58)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(66)) goto parse_options; break; } // optional .google.protobuf.FileOptions options = 8; case 8: { - if (tag == 66) { - parse_options: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(74)) goto parse_source_code_info; break; } // optional .google.protobuf.SourceCodeInfo source_code_info = 9; case 9: { - if (tag == 74) { - parse_source_code_info: + if (tag == 74u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_source_code_info())); } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_public_dependency; break; } // repeated int32 public_dependency = 10; case 10: { - if (tag == 80) { - parse_public_dependency: + if (tag == 80u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 80, input, this->mutable_public_dependency()))); - } else if (tag == 82) { + 1, 80u, input, this->mutable_public_dependency()))); + } else if (tag == 82u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_public_dependency()))); } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_public_dependency; - if (input->ExpectTag(88)) goto parse_weak_dependency; break; } // repeated int32 weak_dependency = 11; case 11: { - if (tag == 88) { - parse_weak_dependency: + if (tag == 88u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 88, input, this->mutable_weak_dependency()))); - } else if (tag == 90) { + 1, 88u, input, this->mutable_weak_dependency()))); + } else if (tag == 90u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_weak_dependency()))); } else { goto handle_unusual; } - if (input->ExpectTag(88)) goto parse_weak_dependency; - if (input->ExpectTag(98)) goto parse_syntax; break; } // optional string syntax = 12; case 12: { - if (tag == 98) { - parse_syntax: + if (tag == 98u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_syntax())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1480,7 +1512,6 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -1604,8 +1635,9 @@ void FileDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorProto) } -::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorProto) // optional string name = 1; if (has_name()) { @@ -1642,43 +1674,43 @@ ::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.DescriptorProto message_type = 4; for (unsigned int i = 0, n = this->message_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, this->message_type(i), target); + InternalWriteMessageNoVirtualToArray( + 4, this->message_type(i), false, target); } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 5, this->enum_type(i), target); + InternalWriteMessageNoVirtualToArray( + 5, this->enum_type(i), false, target); } // repeated .google.protobuf.ServiceDescriptorProto service = 6; for (unsigned int i = 0, n = this->service_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 6, this->service(i), target); + InternalWriteMessageNoVirtualToArray( + 6, this->service(i), false, target); } // repeated .google.protobuf.FieldDescriptorProto extension = 7; for (unsigned int i = 0, n = this->extension_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 7, this->extension(i), target); + InternalWriteMessageNoVirtualToArray( + 7, this->extension(i), false, target); } // optional .google.protobuf.FileOptions options = 8; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 8, *this->options_, false, target); } // optional .google.protobuf.SourceCodeInfo source_code_info = 9; if (has_source_code_info()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 9, *this->source_code_info_, target); + InternalWriteMessageNoVirtualToArray( + 9, *this->source_code_info_, false, target); } // repeated int32 public_dependency = 10; @@ -1712,51 +1744,18 @@ ::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( return target; } -int FileDescriptorProto::ByteSize() const { +size_t FileDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorProto) - int total_size = 0; - - if (_has_bits_[0 / 32] & 3u) { - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } - - // optional string package = 2; - if (has_package()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->package()); - } - - } - if (_has_bits_[9 / 32] & 3584u) { - // optional .google.protobuf.FileOptions options = 8; - if (has_options()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->options_); - } - - // optional .google.protobuf.SourceCodeInfo source_code_info = 9; - if (has_source_code_info()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->source_code_info_); - } - - // optional string syntax = 12; - if (has_syntax()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->syntax()); - } + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } // repeated string dependency = 3; - total_size += 1 * this->dependency_size(); + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->dependency_size()); for (int i = 0; i < this->dependency_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( this->dependency(i)); @@ -1764,71 +1763,122 @@ int FileDescriptorProto::ByteSize() const { // repeated int32 public_dependency = 10; { - int data_size = 0; - for (int i = 0; i < this->public_dependency_size(); i++) { + size_t data_size = 0; + unsigned int count = this->public_dependency_size(); + for (unsigned int i = 0; i < count; i++) { data_size += ::google::protobuf::internal::WireFormatLite:: Int32Size(this->public_dependency(i)); } - total_size += 1 * this->public_dependency_size() + data_size; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->public_dependency_size()); + total_size += data_size; } // repeated int32 weak_dependency = 11; { - int data_size = 0; - for (int i = 0; i < this->weak_dependency_size(); i++) { + size_t data_size = 0; + unsigned int count = this->weak_dependency_size(); + for (unsigned int i = 0; i < count; i++) { data_size += ::google::protobuf::internal::WireFormatLite:: Int32Size(this->weak_dependency(i)); } - total_size += 1 * this->weak_dependency_size() + data_size; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->weak_dependency_size()); + total_size += data_size; } // repeated .google.protobuf.DescriptorProto message_type = 4; - total_size += 1 * this->message_type_size(); - for (int i = 0; i < this->message_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->message_type(i)); + { + unsigned int count = this->message_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->message_type(i)); + } } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; - total_size += 1 * this->enum_type_size(); - for (int i = 0; i < this->enum_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->enum_type(i)); + { + unsigned int count = this->enum_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->enum_type(i)); + } } // repeated .google.protobuf.ServiceDescriptorProto service = 6; - total_size += 1 * this->service_size(); - for (int i = 0; i < this->service_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->service(i)); + { + unsigned int count = this->service_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->service(i)); + } } // repeated .google.protobuf.FieldDescriptorProto extension = 7; - total_size += 1 * this->extension_size(); - for (int i = 0; i < this->extension_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension(i)); + { + unsigned int count = this->extension_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension(i)); + } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[0 / 32] & 31u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional string package = 2; + if (has_package()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->package()); + } + + // optional string syntax = 12; + if (has_syntax()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->syntax()); + } + + // optional .google.protobuf.FileOptions options = 8; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + + // optional .google.protobuf.SourceCodeInfo source_code_info = 9; + if (has_source_code_info()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->source_code_info_); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const FileDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -1842,7 +1892,8 @@ void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); dependency_.MergeFrom(from.dependency_); public_dependency_.MergeFrom(from.public_dependency_); weak_dependency_.MergeFrom(from.weak_dependency_); @@ -1850,7 +1901,7 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { enum_type_.MergeFrom(from.enum_type_); service_.MergeFrom(from.service_); extension_.MergeFrom(from.extension_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 31u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -1859,21 +1910,16 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { set_has_package(); package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_); } - } - if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) { + if (from.has_syntax()) { + set_has_syntax(); + syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); + } if (from.has_options()) { mutable_options()->::google::protobuf::FileOptions::MergeFrom(from.options()); } if (from.has_source_code_info()) { mutable_source_code_info()->::google::protobuf::SourceCodeInfo::MergeFrom(from.source_code_info()); } - if (from.has_syntax()) { - set_has_syntax(); - syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } } @@ -1892,7 +1938,6 @@ void FileDescriptorProto::CopyFrom(const FileDescriptorProto& from) { } bool FileDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->message_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->service())) return false; @@ -1908,8 +1953,6 @@ void FileDescriptorProto::Swap(FileDescriptorProto* other) { InternalSwap(other); } void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { - name_.Swap(&other->name_); - package_.Swap(&other->package_); dependency_.UnsafeArenaSwap(&other->dependency_); public_dependency_.UnsafeArenaSwap(&other->public_dependency_); weak_dependency_.UnsafeArenaSwap(&other->weak_dependency_); @@ -1917,9 +1960,11 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { enum_type_.UnsafeArenaSwap(&other->enum_type_); service_.UnsafeArenaSwap(&other->service_); extension_.UnsafeArenaSwap(&other->extension_); + name_.Swap(&other->name_); + package_.Swap(&other->package_); + syntax_.Swap(&other->syntax_); std::swap(options_, other->options_); std::swap(source_code_info_, other->source_code_info_); - syntax_.Swap(&other->syntax_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -1927,10 +1972,7 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { ::google::protobuf::Metadata FileDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileDescriptorProto_descriptor_; - metadata.reflection = FileDescriptorProto_reflection_; - return metadata; + return file_level_metadata[1]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -1950,37 +1992,45 @@ void FileDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& FileDescriptorProto::name() const { +const ::std::string& FileDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void FileDescriptorProto::set_name(const ::std::string& value) { +void FileDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name) } - void FileDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.name) +} +#endif +void FileDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.name) } - void FileDescriptorProto::set_name(const char* value, size_t size) { +void FileDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.name) } - ::std::string* FileDescriptorProto::mutable_name() { +::std::string* FileDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_name() { +::std::string* FileDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_name(::std::string* name) { +void FileDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -2004,37 +2054,45 @@ void FileDescriptorProto::clear_package() { package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_package(); } - const ::std::string& FileDescriptorProto::package() const { +const ::std::string& FileDescriptorProto::package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package) - return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return package_.GetNoArena(); } - void FileDescriptorProto::set_package(const ::std::string& value) { +void FileDescriptorProto::set_package(const ::std::string& value) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package) } - void FileDescriptorProto::set_package(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_package(::std::string&& value) { + set_has_package(); + package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.package) +} +#endif +void FileDescriptorProto::set_package(const char* value) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.package) } - void FileDescriptorProto::set_package(const char* value, size_t size) { +void FileDescriptorProto::set_package(const char* value, size_t size) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.package) } - ::std::string* FileDescriptorProto::mutable_package() { +::std::string* FileDescriptorProto::mutable_package() { set_has_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package) return package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_package() { +::std::string* FileDescriptorProto::release_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package) clear_has_package(); return package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_package(::std::string* package) { +void FileDescriptorProto::set_allocated_package(::std::string* package) { if (package != NULL) { set_has_package(); } else { @@ -2051,49 +2109,49 @@ int FileDescriptorProto::dependency_size() const { void FileDescriptorProto::clear_dependency() { dependency_.Clear(); } - const ::std::string& FileDescriptorProto::dependency(int index) const { +const ::std::string& FileDescriptorProto::dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.dependency) return dependency_.Get(index); } - ::std::string* FileDescriptorProto::mutable_dependency(int index) { +::std::string* FileDescriptorProto::mutable_dependency(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency) return dependency_.Mutable(index); } - void FileDescriptorProto::set_dependency(int index, const ::std::string& value) { +void FileDescriptorProto::set_dependency(int index, const ::std::string& value) { // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency) dependency_.Mutable(index)->assign(value); } - void FileDescriptorProto::set_dependency(int index, const char* value) { +void FileDescriptorProto::set_dependency(int index, const char* value) { dependency_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) { +void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) { dependency_.Mutable(index)->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.dependency) } - ::std::string* FileDescriptorProto::add_dependency() { +::std::string* FileDescriptorProto::add_dependency() { // @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency) return dependency_.Add(); } - void FileDescriptorProto::add_dependency(const ::std::string& value) { +void FileDescriptorProto::add_dependency(const ::std::string& value) { dependency_.Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::add_dependency(const char* value) { +void FileDescriptorProto::add_dependency(const char* value) { dependency_.Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::add_dependency(const char* value, size_t size) { +void FileDescriptorProto::add_dependency(const char* value, size_t size) { dependency_.Add()->assign(reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency) } - const ::google::protobuf::RepeatedPtrField< ::std::string>& +const ::google::protobuf::RepeatedPtrField< ::std::string>& FileDescriptorProto::dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency) return dependency_; } - ::google::protobuf::RepeatedPtrField< ::std::string>* +::google::protobuf::RepeatedPtrField< ::std::string>* FileDescriptorProto::mutable_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency) return &dependency_; @@ -2106,24 +2164,24 @@ int FileDescriptorProto::public_dependency_size() const { void FileDescriptorProto::clear_public_dependency() { public_dependency_.Clear(); } - ::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const { +::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency) return public_dependency_.Get(index); } - void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) { +void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) { public_dependency_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency) } - void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) { +void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) { public_dependency_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& FileDescriptorProto::public_dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency) return public_dependency_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* FileDescriptorProto::mutable_public_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency) return &public_dependency_; @@ -2136,24 +2194,24 @@ int FileDescriptorProto::weak_dependency_size() const { void FileDescriptorProto::clear_weak_dependency() { weak_dependency_.Clear(); } - ::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const { +::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency) return weak_dependency_.Get(index); } - void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) { +void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) { weak_dependency_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency) } - void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) { +void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) { weak_dependency_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& FileDescriptorProto::weak_dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency) return weak_dependency_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* FileDescriptorProto::mutable_weak_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency) return &weak_dependency_; @@ -2281,13 +2339,13 @@ FileDescriptorProto::extension() const { // optional .google.protobuf.FileOptions options = 8; bool FileDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FileDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000008u; } void FileDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000008u; } void FileDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear(); @@ -2295,7 +2353,8 @@ void FileDescriptorProto::clear_options() { } const ::google::protobuf::FileOptions& FileDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::FileOptions::internal_default_instance(); } ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() { set_has_options(); @@ -2325,13 +2384,13 @@ void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions* // optional .google.protobuf.SourceCodeInfo source_code_info = 9; bool FileDescriptorProto::has_source_code_info() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FileDescriptorProto::set_has_source_code_info() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00000010u; } void FileDescriptorProto::clear_has_source_code_info() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00000010u; } void FileDescriptorProto::clear_source_code_info() { if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); @@ -2339,7 +2398,8 @@ void FileDescriptorProto::clear_source_code_info() { } const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info) - return source_code_info_ != NULL ? *source_code_info_ : *default_instance_->source_code_info_; + return source_code_info_ != NULL ? *source_code_info_ + : *::google::protobuf::SourceCodeInfo::internal_default_instance(); } ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() { set_has_source_code_info(); @@ -2369,49 +2429,57 @@ void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::Sou // optional string syntax = 12; bool FileDescriptorProto::has_syntax() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FileDescriptorProto::set_has_syntax() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00000004u; } void FileDescriptorProto::clear_has_syntax() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00000004u; } void FileDescriptorProto::clear_syntax() { syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_syntax(); } - const ::std::string& FileDescriptorProto::syntax() const { +const ::std::string& FileDescriptorProto::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax) - return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return syntax_.GetNoArena(); } - void FileDescriptorProto::set_syntax(const ::std::string& value) { +void FileDescriptorProto::set_syntax(const ::std::string& value) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax) } - void FileDescriptorProto::set_syntax(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_syntax(::std::string&& value) { + set_has_syntax(); + syntax_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.syntax) +} +#endif +void FileDescriptorProto::set_syntax(const char* value) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.syntax) } - void FileDescriptorProto::set_syntax(const char* value, size_t size) { +void FileDescriptorProto::set_syntax(const char* value, size_t size) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.syntax) } - ::std::string* FileDescriptorProto::mutable_syntax() { +::std::string* FileDescriptorProto::mutable_syntax() { set_has_syntax(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.syntax) return syntax_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_syntax() { +::std::string* FileDescriptorProto::release_syntax() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.syntax) clear_has_syntax(); return syntax_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) { +void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) { if (syntax != NULL) { set_has_syntax(); } else { @@ -2432,26 +2500,28 @@ const int DescriptorProto_ExtensionRange::kEndFieldNumber; DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ExtensionRange) } - -void DescriptorProto_ExtensionRange::InitAsDefaultInstance() { -} - DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::memcpy(&start_, &from.start_, + reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange) } void DescriptorProto_ExtensionRange::SharedCtor() { _cached_size_ = 0; - start_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() { @@ -2460,8 +2530,6 @@ DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() { } void DescriptorProto_ExtensionRange::SharedDtor() { - if (this != default_instance_) { - } } void DescriptorProto_ExtensionRange::SetCachedSize(int size) const { @@ -2471,16 +2539,14 @@ void DescriptorProto_ExtensionRange::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_ExtensionRange_descriptor_; + return file_level_metadata[2].descriptor; } const DescriptorProto_ExtensionRange& DescriptorProto_ExtensionRange::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::default_instance_ = NULL; - DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::protobuf::Arena* arena) const { DescriptorProto_ExtensionRange* n = new DescriptorProto_ExtensionRange; if (arena != NULL) { @@ -2491,31 +2557,12 @@ DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::pr void DescriptorProto_ExtensionRange::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(DescriptorProto_ExtensionRange, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(start_, end_); - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream( @@ -2524,36 +2571,33 @@ bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ExtensionRange) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional int32 start = 1; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_start(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &start_))); - set_has_start(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_end; break; } // optional int32 end = 2; case 2: { - if (tag == 16) { - parse_end: + if (tag == 16u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -2599,8 +2643,9 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ExtensionRange) } -::google::protobuf::uint8* DescriptorProto_ExtensionRange::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto_ExtensionRange::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ExtensionRange) // optional int32 start = 1; if (has_start()) { @@ -2620,10 +2665,15 @@ ::google::protobuf::uint8* DescriptorProto_ExtensionRange::SerializeWithCachedSi return target; } -int DescriptorProto_ExtensionRange::ByteSize() const { +size_t DescriptorProto_ExtensionRange::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ExtensionRange) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 3u) { // optional int32 start = 1; if (has_start()) { @@ -2640,21 +2690,17 @@ int DescriptorProto_ExtensionRange::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto_ExtensionRange* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto_ExtensionRange* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -2668,8 +2714,9 @@ void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRange& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_start()) { set_start(from.start()); } @@ -2677,9 +2724,6 @@ void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRa set_end(from.end()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto_ExtensionRange::CopyFrom(const ::google::protobuf::Message& from) { @@ -2697,7 +2741,6 @@ void DescriptorProto_ExtensionRange::CopyFrom(const DescriptorProto_ExtensionRan } bool DescriptorProto_ExtensionRange::IsInitialized() const { - return true; } @@ -2715,14 +2758,63 @@ void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange ::google::protobuf::Metadata DescriptorProto_ExtensionRange::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_ExtensionRange_descriptor_; - metadata.reflection = DescriptorProto_ExtensionRange_reflection_; - return metadata; + return file_level_metadata[2]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// DescriptorProto_ExtensionRange + +// optional int32 start = 1; +bool DescriptorProto_ExtensionRange::has_start() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void DescriptorProto_ExtensionRange::set_has_start() { + _has_bits_[0] |= 0x00000001u; +} +void DescriptorProto_ExtensionRange::clear_has_start() { + _has_bits_[0] &= ~0x00000001u; +} +void DescriptorProto_ExtensionRange::clear_start() { + start_ = 0; + clear_has_start(); +} +::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start) + return start_; +} +void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) { + set_has_start(); + start_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start) +} + +// optional int32 end = 2; +bool DescriptorProto_ExtensionRange::has_end() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void DescriptorProto_ExtensionRange::set_has_end() { + _has_bits_[0] |= 0x00000002u; +} +void DescriptorProto_ExtensionRange::clear_has_end() { + _has_bits_[0] &= ~0x00000002u; +} +void DescriptorProto_ExtensionRange::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end) + return end_; +} +void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int DescriptorProto_ReservedRange::kStartFieldNumber; @@ -2731,26 +2823,28 @@ const int DescriptorProto_ReservedRange::kEndFieldNumber; DescriptorProto_ReservedRange::DescriptorProto_ReservedRange() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ReservedRange) } - -void DescriptorProto_ReservedRange::InitAsDefaultInstance() { -} - DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::memcpy(&start_, &from.start_, + reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ReservedRange) } void DescriptorProto_ReservedRange::SharedCtor() { _cached_size_ = 0; - start_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() { @@ -2759,8 +2853,6 @@ DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() { } void DescriptorProto_ReservedRange::SharedDtor() { - if (this != default_instance_) { - } } void DescriptorProto_ReservedRange::SetCachedSize(int size) const { @@ -2770,16 +2862,14 @@ void DescriptorProto_ReservedRange::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_ReservedRange_descriptor_; + return file_level_metadata[3].descriptor; } const DescriptorProto_ReservedRange& DescriptorProto_ReservedRange::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::default_instance_ = NULL; - DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::protobuf::Arena* arena) const { DescriptorProto_ReservedRange* n = new DescriptorProto_ReservedRange; if (arena != NULL) { @@ -2790,31 +2880,12 @@ DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::prot void DescriptorProto_ReservedRange::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(DescriptorProto_ReservedRange, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(start_, end_); - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto_ReservedRange::MergePartialFromCodedStream( @@ -2823,36 +2894,33 @@ bool DescriptorProto_ReservedRange::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ReservedRange) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional int32 start = 1; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_start(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &start_))); - set_has_start(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_end; break; } // optional int32 end = 2; case 2: { - if (tag == 16) { - parse_end: + if (tag == 16u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -2898,8 +2966,9 @@ void DescriptorProto_ReservedRange::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ReservedRange) } -::google::protobuf::uint8* DescriptorProto_ReservedRange::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto_ReservedRange::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ReservedRange) // optional int32 start = 1; if (has_start()) { @@ -2919,10 +2988,15 @@ ::google::protobuf::uint8* DescriptorProto_ReservedRange::SerializeWithCachedSiz return target; } -int DescriptorProto_ReservedRange::ByteSize() const { +size_t DescriptorProto_ReservedRange::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ReservedRange) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 3u) { // optional int32 start = 1; if (has_start()) { @@ -2939,21 +3013,17 @@ int DescriptorProto_ReservedRange::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ReservedRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto_ReservedRange* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto_ReservedRange* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -2967,8 +3037,9 @@ void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRange& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ReservedRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_start()) { set_start(from.start()); } @@ -2976,9 +3047,6 @@ void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRang set_end(from.end()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto_ReservedRange::CopyFrom(const ::google::protobuf::Message& from) { @@ -2996,7 +3064,6 @@ void DescriptorProto_ReservedRange::CopyFrom(const DescriptorProto_ReservedRange } bool DescriptorProto_ReservedRange::IsInitialized() const { - return true; } @@ -3014,14 +3081,63 @@ void DescriptorProto_ReservedRange::InternalSwap(DescriptorProto_ReservedRange* ::google::protobuf::Metadata DescriptorProto_ReservedRange::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_ReservedRange_descriptor_; - metadata.reflection = DescriptorProto_ReservedRange_reflection_; - return metadata; + return file_level_metadata[3]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// DescriptorProto_ReservedRange + +// optional int32 start = 1; +bool DescriptorProto_ReservedRange::has_start() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void DescriptorProto_ReservedRange::set_has_start() { + _has_bits_[0] |= 0x00000001u; +} +void DescriptorProto_ReservedRange::clear_has_start() { + _has_bits_[0] &= ~0x00000001u; +} +void DescriptorProto_ReservedRange::clear_start() { + start_ = 0; + clear_has_start(); +} +::google::protobuf::int32 DescriptorProto_ReservedRange::start() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start) + return start_; +} +void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) { + set_has_start(); + start_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start) +} + +// optional int32 end = 2; +bool DescriptorProto_ReservedRange::has_end() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void DescriptorProto_ReservedRange::set_has_end() { + _has_bits_[0] |= 0x00000002u; +} +void DescriptorProto_ReservedRange::clear_has_end() { + _has_bits_[0] &= ~0x00000002u; +} +void DescriptorProto_ReservedRange::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 DescriptorProto_ReservedRange::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end) + return end_; +} +void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int DescriptorProto::kNameFieldNumber; @@ -3038,28 +3154,42 @@ const int DescriptorProto::kReservedNameFieldNumber; DescriptorProto::DescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto) } - -void DescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::MessageOptions*>(&::google::protobuf::MessageOptions::default_instance()); -} - DescriptorProto::DescriptorProto(const DescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + field_(from.field_), + extension_(from.extension_), + nested_type_(from.nested_type_), + enum_type_(from.enum_type_), + extension_range_(from.extension_range_), + oneof_decl_(from.oneof_decl_), + reserved_range_(from.reserved_range_), + reserved_name_(from.reserved_name_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::MessageOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto) } void DescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } DescriptorProto::~DescriptorProto() { @@ -3069,7 +3199,7 @@ DescriptorProto::~DescriptorProto() { void DescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -3081,16 +3211,14 @@ void DescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_descriptor_; + return file_level_metadata[4].descriptor; } const DescriptorProto& DescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto* DescriptorProto::default_instance_ = NULL; - DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const { DescriptorProto* n = new DescriptorProto; if (arena != NULL) { @@ -3101,14 +3229,6 @@ DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const { void DescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto) - if (_has_bits_[0 / 32] & 129u) { - if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear(); - } - } field_.Clear(); extension_.Clear(); nested_type_.Clear(); @@ -3117,10 +3237,18 @@ void DescriptorProto::Clear() { oneof_decl_.Clear(); reserved_range_.Clear(); reserved_name_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_name()) { + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); + } + if (has_options()) { + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::MessageOptions::Clear(); + } } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto::MergePartialFromCodedStream( @@ -3129,13 +3257,13 @@ bool DescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3145,141 +3273,114 @@ bool DescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_field; break; } // repeated .google.protobuf.FieldDescriptorProto field = 2; case 2: { - if (tag == 18) { - parse_field: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_field: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_field())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_field; - if (input->ExpectTag(26)) goto parse_loop_nested_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto nested_type = 3; case 3: { - if (tag == 26) { + if (tag == 26u) { DO_(input->IncrementRecursionDepth()); - parse_loop_nested_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_nested_type())); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_loop_nested_type; - if (input->ExpectTag(34)) goto parse_loop_enum_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; case 4: { - if (tag == 34) { + if (tag == 34u) { DO_(input->IncrementRecursionDepth()); - parse_loop_enum_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_enum_type())); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_loop_enum_type; - if (input->ExpectTag(42)) goto parse_loop_extension_range; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; case 5: { - if (tag == 42) { + if (tag == 42u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension_range: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension_range())); } else { goto handle_unusual; } - if (input->ExpectTag(42)) goto parse_loop_extension_range; - if (input->ExpectTag(50)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.FieldDescriptorProto extension = 6; case 6: { - if (tag == 50) { + if (tag == 50u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension())); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(58)) goto parse_options; break; } // optional .google.protobuf.MessageOptions options = 7; case 7: { - if (tag == 58) { - parse_options: + if (tag == 58u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_oneof_decl; break; } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; case 8: { - if (tag == 66) { - parse_oneof_decl: + if (tag == 66u) { DO_(input->IncrementRecursionDepth()); - parse_loop_oneof_decl: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_oneof_decl())); } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_loop_oneof_decl; - if (input->ExpectTag(74)) goto parse_loop_reserved_range; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; case 9: { - if (tag == 74) { + if (tag == 74u) { DO_(input->IncrementRecursionDepth()); - parse_loop_reserved_range: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_reserved_range())); } else { goto handle_unusual; } - if (input->ExpectTag(74)) goto parse_loop_reserved_range; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(82)) goto parse_reserved_name; break; } // repeated string reserved_name = 10; case 10: { - if (tag == 82) { - parse_reserved_name: + if (tag == 82u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_reserved_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3290,8 +3391,6 @@ bool DescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(82)) goto parse_reserved_name; - if (input->ExpectAtEnd()) goto success; break; } @@ -3395,8 +3494,9 @@ void DescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto) } -::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto) // optional string name = 1; if (has_name()) { @@ -3412,57 +3512,57 @@ ::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.FieldDescriptorProto field = 2; for (unsigned int i = 0, n = this->field_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->field(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->field(i), false, target); } // repeated .google.protobuf.DescriptorProto nested_type = 3; for (unsigned int i = 0, n = this->nested_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, this->nested_type(i), target); + InternalWriteMessageNoVirtualToArray( + 3, this->nested_type(i), false, target); } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, this->enum_type(i), target); + InternalWriteMessageNoVirtualToArray( + 4, this->enum_type(i), false, target); } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; for (unsigned int i = 0, n = this->extension_range_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 5, this->extension_range(i), target); + InternalWriteMessageNoVirtualToArray( + 5, this->extension_range(i), false, target); } // repeated .google.protobuf.FieldDescriptorProto extension = 6; for (unsigned int i = 0, n = this->extension_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 6, this->extension(i), target); + InternalWriteMessageNoVirtualToArray( + 6, this->extension(i), false, target); } // optional .google.protobuf.MessageOptions options = 7; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 7, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 7, *this->options_, false, target); } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; for (unsigned int i = 0, n = this->oneof_decl_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, this->oneof_decl(i), target); + InternalWriteMessageNoVirtualToArray( + 8, this->oneof_decl(i), false, target); } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; for (unsigned int i = 0, n = this->reserved_range_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 9, this->reserved_range(i), target); + InternalWriteMessageNoVirtualToArray( + 9, this->reserved_range(i), false, target); } // repeated string reserved_name = 10; @@ -3483,104 +3583,127 @@ ::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( return target; } -int DescriptorProto::ByteSize() const { +size_t DescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto) - int total_size = 0; - - if (_has_bits_[0 / 32] & 129u) { - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } - - // optional .google.protobuf.MessageOptions options = 7; - if (has_options()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->options_); - } + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } // repeated .google.protobuf.FieldDescriptorProto field = 2; - total_size += 1 * this->field_size(); - for (int i = 0; i < this->field_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->field(i)); + { + unsigned int count = this->field_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->field(i)); + } } // repeated .google.protobuf.FieldDescriptorProto extension = 6; - total_size += 1 * this->extension_size(); - for (int i = 0; i < this->extension_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension(i)); + { + unsigned int count = this->extension_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension(i)); + } } // repeated .google.protobuf.DescriptorProto nested_type = 3; - total_size += 1 * this->nested_type_size(); - for (int i = 0; i < this->nested_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->nested_type(i)); + { + unsigned int count = this->nested_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->nested_type(i)); + } } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; - total_size += 1 * this->enum_type_size(); - for (int i = 0; i < this->enum_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->enum_type(i)); + { + unsigned int count = this->enum_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->enum_type(i)); + } } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; - total_size += 1 * this->extension_range_size(); - for (int i = 0; i < this->extension_range_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension_range(i)); + { + unsigned int count = this->extension_range_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension_range(i)); + } } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; - total_size += 1 * this->oneof_decl_size(); - for (int i = 0; i < this->oneof_decl_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->oneof_decl(i)); + { + unsigned int count = this->oneof_decl_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->oneof_decl(i)); + } } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; - total_size += 1 * this->reserved_range_size(); - for (int i = 0; i < this->reserved_range_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->reserved_range(i)); + { + unsigned int count = this->reserved_range_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->reserved_range(i)); + } } // repeated string reserved_name = 10; - total_size += 1 * this->reserved_name_size(); + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->reserved_name_size()); for (int i = 0; i < this->reserved_name_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( this->reserved_name(i)); } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[0 / 32] & 3u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional .google.protobuf.MessageOptions options = 7; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -3594,7 +3717,8 @@ void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void DescriptorProto::MergeFrom(const DescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); field_.MergeFrom(from.field_); extension_.MergeFrom(from.extension_); nested_type_.MergeFrom(from.nested_type_); @@ -3603,7 +3727,7 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) { oneof_decl_.MergeFrom(from.oneof_decl_); reserved_range_.MergeFrom(from.reserved_range_); reserved_name_.MergeFrom(from.reserved_name_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -3612,9 +3736,6 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) { mutable_options()->::google::protobuf::MessageOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -3632,11 +3753,11 @@ void DescriptorProto::CopyFrom(const DescriptorProto& from) { } bool DescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->field())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->extension())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->nested_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false; + if (!::google::protobuf::internal::AllAreInitialized(this->oneof_decl())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -3648,16 +3769,16 @@ void DescriptorProto::Swap(DescriptorProto* other) { InternalSwap(other); } void DescriptorProto::InternalSwap(DescriptorProto* other) { - name_.Swap(&other->name_); field_.UnsafeArenaSwap(&other->field_); extension_.UnsafeArenaSwap(&other->extension_); nested_type_.UnsafeArenaSwap(&other->nested_type_); enum_type_.UnsafeArenaSwap(&other->enum_type_); extension_range_.UnsafeArenaSwap(&other->extension_range_); oneof_decl_.UnsafeArenaSwap(&other->oneof_decl_); - std::swap(options_, other->options_); reserved_range_.UnsafeArenaSwap(&other->reserved_range_); reserved_name_.UnsafeArenaSwap(&other->reserved_name_); + name_.Swap(&other->name_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -3665,117 +3786,10 @@ void DescriptorProto::InternalSwap(DescriptorProto* other) { ::google::protobuf::Metadata DescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_descriptor_; - metadata.reflection = DescriptorProto_reflection_; - return metadata; + return file_level_metadata[4]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// DescriptorProto_ExtensionRange - -// optional int32 start = 1; -bool DescriptorProto_ExtensionRange::has_start() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -void DescriptorProto_ExtensionRange::set_has_start() { - _has_bits_[0] |= 0x00000001u; -} -void DescriptorProto_ExtensionRange::clear_has_start() { - _has_bits_[0] &= ~0x00000001u; -} -void DescriptorProto_ExtensionRange::clear_start() { - start_ = 0; - clear_has_start(); -} - ::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start) - return start_; -} - void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) { - set_has_start(); - start_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start) -} - -// optional int32 end = 2; -bool DescriptorProto_ExtensionRange::has_end() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void DescriptorProto_ExtensionRange::set_has_end() { - _has_bits_[0] |= 0x00000002u; -} -void DescriptorProto_ExtensionRange::clear_has_end() { - _has_bits_[0] &= ~0x00000002u; -} -void DescriptorProto_ExtensionRange::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end) - return end_; -} - void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end) -} - -// ------------------------------------------------------------------- - -// DescriptorProto_ReservedRange - -// optional int32 start = 1; -bool DescriptorProto_ReservedRange::has_start() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -void DescriptorProto_ReservedRange::set_has_start() { - _has_bits_[0] |= 0x00000001u; -} -void DescriptorProto_ReservedRange::clear_has_start() { - _has_bits_[0] &= ~0x00000001u; -} -void DescriptorProto_ReservedRange::clear_start() { - start_ = 0; - clear_has_start(); -} - ::google::protobuf::int32 DescriptorProto_ReservedRange::start() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start) - return start_; -} - void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) { - set_has_start(); - start_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start) -} - -// optional int32 end = 2; -bool DescriptorProto_ReservedRange::has_end() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void DescriptorProto_ReservedRange::set_has_end() { - _has_bits_[0] |= 0x00000002u; -} -void DescriptorProto_ReservedRange::clear_has_end() { - _has_bits_[0] &= ~0x00000002u; -} -void DescriptorProto_ReservedRange::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 DescriptorProto_ReservedRange::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end) - return end_; -} - void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end) -} - -// ------------------------------------------------------------------- - // DescriptorProto // optional string name = 1; @@ -3792,37 +3806,45 @@ void DescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& DescriptorProto::name() const { +const ::std::string& DescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void DescriptorProto::set_name(const ::std::string& value) { +void DescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name) } - void DescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void DescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.DescriptorProto.name) +} +#endif +void DescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.name) } - void DescriptorProto::set_name(const char* value, size_t size) { +void DescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.name) } - ::std::string* DescriptorProto::mutable_name() { +::std::string* DescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* DescriptorProto::release_name() { +::std::string* DescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void DescriptorProto::set_allocated_name(::std::string* name) { +void DescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -4014,13 +4036,13 @@ DescriptorProto::oneof_decl() const { // optional .google.protobuf.MessageOptions options = 7; bool DescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void DescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000002u; } void DescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000002u; } void DescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear(); @@ -4028,7 +4050,8 @@ void DescriptorProto::clear_options() { } const ::google::protobuf::MessageOptions& DescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::MessageOptions::internal_default_instance(); } ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() { set_has_options(); @@ -4093,49 +4116,49 @@ int DescriptorProto::reserved_name_size() const { void DescriptorProto::clear_reserved_name() { reserved_name_.Clear(); } - const ::std::string& DescriptorProto::reserved_name(int index) const { +const ::std::string& DescriptorProto::reserved_name(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Get(index); } - ::std::string* DescriptorProto::mutable_reserved_name(int index) { +::std::string* DescriptorProto::mutable_reserved_name(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Mutable(index); } - void DescriptorProto::set_reserved_name(int index, const ::std::string& value) { +void DescriptorProto::set_reserved_name(int index, const ::std::string& value) { // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name) reserved_name_.Mutable(index)->assign(value); } - void DescriptorProto::set_reserved_name(int index, const char* value) { +void DescriptorProto::set_reserved_name(int index, const char* value) { reserved_name_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) { +void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) { reserved_name_.Mutable(index)->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.reserved_name) } - ::std::string* DescriptorProto::add_reserved_name() { +::std::string* DescriptorProto::add_reserved_name() { // @@protoc_insertion_point(field_add_mutable:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Add(); } - void DescriptorProto::add_reserved_name(const ::std::string& value) { +void DescriptorProto::add_reserved_name(const ::std::string& value) { reserved_name_.Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::add_reserved_name(const char* value) { +void DescriptorProto::add_reserved_name(const char* value) { reserved_name_.Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::add_reserved_name(const char* value, size_t size) { +void DescriptorProto::add_reserved_name(const char* value, size_t size) { reserved_name_.Add()->assign(reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name) } - const ::google::protobuf::RepeatedPtrField< ::std::string>& +const ::google::protobuf::RepeatedPtrField< ::std::string>& DescriptorProto::reserved_name() const { // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name) return reserved_name_; } - ::google::protobuf::RepeatedPtrField< ::std::string>* +::google::protobuf::RepeatedPtrField< ::std::string>* DescriptorProto::mutable_reserved_name() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name) return &reserved_name_; @@ -4145,82 +4168,6 @@ DescriptorProto::mutable_reserved_name() { // =================================================================== -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_Type_descriptor_; -} -bool FieldDescriptorProto_Type_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64; -const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN; -const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX; -const int FieldDescriptorProto::Type_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_Label_descriptor_; -} -bool FieldDescriptorProto_Label_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL; -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED; -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED; -const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN; -const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX; -const int FieldDescriptorProto::Label_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FieldDescriptorProto::kNameFieldNumber; const int FieldDescriptorProto::kNumberFieldNumber; @@ -4236,36 +4183,60 @@ const int FieldDescriptorProto::kOptionsFieldNumber; FieldDescriptorProto::FieldDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FieldDescriptorProto) } - -void FieldDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::FieldOptions*>(&::google::protobuf::FieldOptions::default_instance()); -} - FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_type_name()) { + type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_); + } + extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_extendee()) { + extendee_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.extendee_); + } + default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_default_value()) { + default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_); + } + json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_json_name()) { + json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::FieldOptions(*from.options_); + } else { + options_ = NULL; + } + ::memcpy(&number_, &from.number_, + reinterpret_cast(&type_) - + reinterpret_cast(&number_) + sizeof(type_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldDescriptorProto) } void FieldDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - number_ = 0; - label_ = 1; - type_ = 1; type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - oneof_index_ = 0; json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&oneof_index_) - + reinterpret_cast(&options_) + sizeof(oneof_index_)); + label_ = 1; + type_ = 1; } FieldDescriptorProto::~FieldDescriptorProto() { @@ -4279,7 +4250,7 @@ void FieldDescriptorProto::SharedDtor() { extendee_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); default_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); json_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -4291,16 +4262,14 @@ void FieldDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FieldDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_descriptor_; + return file_level_metadata[5].descriptor; } const FieldDescriptorProto& FieldDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FieldDescriptorProto* FieldDescriptorProto::default_instance_ = NULL; - FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena) const { FieldDescriptorProto* n = new FieldDescriptorProto; if (arena != NULL) { @@ -4311,36 +4280,42 @@ FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena void FieldDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto) - if (_has_bits_[0 / 32] & 255u) { + if (_has_bits_[0 / 32] & 63u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } - number_ = 0; - label_ = 1; - type_ = 1; if (has_type_name()) { - type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!type_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*type_name_.UnsafeRawStringPointer())->clear(); } if (has_extendee()) { - extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!extendee_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*extendee_.UnsafeRawStringPointer())->clear(); } if (has_default_value()) { - default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!default_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*default_value_.UnsafeRawStringPointer())->clear(); } - oneof_index_ = 0; - } - if (_has_bits_[8 / 32] & 768u) { if (has_json_name()) { - json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!json_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*json_name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::FieldOptions::Clear(); } } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 192u) { + ::memset(&number_, 0, reinterpret_cast(&oneof_index_) - + reinterpret_cast(&number_) + sizeof(oneof_index_)); + } + if (_has_bits_[8 / 32] & 768u) { + label_ = 1; + type_ = 1; } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FieldDescriptorProto::MergePartialFromCodedStream( @@ -4349,13 +4324,13 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FieldDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4365,14 +4340,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_extendee; break; } // optional string extendee = 2; case 2: { - if (tag == 18) { - parse_extendee: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_extendee())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4382,29 +4355,25 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_number; break; } // optional int32 number = 3; case 3: { - if (tag == 24) { - parse_number: + if (tag == 24u) { + set_has_number(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &number_))); - set_has_number(); } else { goto handle_unusual; } - if (input->ExpectTag(32)) goto parse_label; break; } // optional .google.protobuf.FieldDescriptorProto.Label label = 4; case 4: { - if (tag == 32) { - parse_label: + if (tag == 32u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -4417,14 +4386,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_type; break; } // optional .google.protobuf.FieldDescriptorProto.Type type = 5; case 5: { - if (tag == 40) { - parse_type: + if (tag == 40u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -4437,14 +4404,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_type_name; break; } // optional string type_name = 6; case 6: { - if (tag == 50) { - parse_type_name: + if (tag == 50u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_type_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4454,14 +4419,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(58)) goto parse_default_value; break; } // optional string default_value = 7; case 7: { - if (tag == 58) { - parse_default_value: + if (tag == 58u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_default_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4471,42 +4434,36 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_options; break; } // optional .google.protobuf.FieldOptions options = 8; case 8: { - if (tag == 66) { - parse_options: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(72)) goto parse_oneof_index; break; } // optional int32 oneof_index = 9; case 9: { - if (tag == 72) { - parse_oneof_index: + if (tag == 72u) { + set_has_oneof_index(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &oneof_index_))); - set_has_oneof_index(); } else { goto handle_unusual; } - if (input->ExpectTag(82)) goto parse_json_name; break; } // optional string json_name = 10; case 10: { - if (tag == 82) { - parse_json_name: + if (tag == 82u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_json_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4516,7 +4473,6 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -4630,8 +4586,9 @@ void FieldDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FieldDescriptorProto) } -::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FieldDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldDescriptorProto) // optional string name = 1; if (has_name()) { @@ -4697,8 +4654,8 @@ ::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray // optional .google.protobuf.FieldOptions options = 8; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 8, *this->options_, false, target); } // optional int32 oneof_index = 9; @@ -4725,10 +4682,15 @@ ::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray return target; } -int FieldDescriptorProto::ByteSize() const { +size_t FieldDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 255u) { // optional string name = 1; if (has_name()) { @@ -4737,25 +4699,6 @@ int FieldDescriptorProto::ByteSize() const { this->name()); } - // optional int32 number = 3; - if (has_number()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->number()); - } - - // optional .google.protobuf.FieldDescriptorProto.Label label = 4; - if (has_label()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->label()); - } - - // optional .google.protobuf.FieldDescriptorProto.Type type = 5; - if (has_type()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); - } - // optional string type_name = 6; if (has_type_name()) { total_size += 1 + @@ -4777,15 +4720,6 @@ int FieldDescriptorProto::ByteSize() const { this->default_value()); } - // optional int32 oneof_index = 9; - if (has_oneof_index()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->oneof_index()); - } - - } - if (_has_bits_[8 / 32] & 768u) { // optional string json_name = 10; if (has_json_name()) { total_size += 1 + @@ -4800,22 +4734,46 @@ int FieldDescriptorProto::ByteSize() const { *this->options_); } + // optional int32 number = 3; + if (has_number()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->number()); + } + + // optional int32 oneof_index = 9; + if (has_oneof_index()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->oneof_index()); + } + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[8 / 32] & 768u) { + // optional .google.protobuf.FieldDescriptorProto.Label label = 4; + if (has_label()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->label()); + } + + // optional .google.protobuf.FieldDescriptorProto.Type type = 5; + if (has_type()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FieldDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const FieldDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -4829,21 +4787,13 @@ void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 255u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.has_number()) { - set_number(from.number()); - } - if (from.has_label()) { - set_label(from.label()); - } - if (from.has_type()) { - set_type(from.type()); - } if (from.has_type_name()) { set_has_type_name(); type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_); @@ -4856,11 +4806,6 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { set_has_default_value(); default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_); } - if (from.has_oneof_index()) { - set_oneof_index(from.oneof_index()); - } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_json_name()) { set_has_json_name(); json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_); @@ -4868,9 +4813,20 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { if (from.has_options()) { mutable_options()->::google::protobuf::FieldOptions::MergeFrom(from.options()); } + if (from.has_number()) { + set_number(from.number()); + } + if (from.has_oneof_index()) { + set_oneof_index(from.oneof_index()); + } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from._has_bits_[8 / 32] & 768u) { + if (from.has_label()) { + set_label(from.label()); + } + if (from.has_type()) { + set_type(from.type()); + } } } @@ -4889,7 +4845,6 @@ void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) { } bool FieldDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -4902,15 +4857,15 @@ void FieldDescriptorProto::Swap(FieldDescriptorProto* other) { } void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) { name_.Swap(&other->name_); - std::swap(number_, other->number_); - std::swap(label_, other->label_); - std::swap(type_, other->type_); type_name_.Swap(&other->type_name_); extendee_.Swap(&other->extendee_); default_value_.Swap(&other->default_value_); - std::swap(oneof_index_, other->oneof_index_); json_name_.Swap(&other->json_name_); std::swap(options_, other->options_); + std::swap(number_, other->number_); + std::swap(oneof_index_, other->oneof_index_); + std::swap(label_, other->label_); + std::swap(type_, other->type_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -4918,10 +4873,7 @@ void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) { ::google::protobuf::Metadata FieldDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FieldDescriptorProto_descriptor_; - metadata.reflection = FieldDescriptorProto_reflection_; - return metadata; + return file_level_metadata[5]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -4941,37 +4893,45 @@ void FieldDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& FieldDescriptorProto::name() const { +const ::std::string& FieldDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void FieldDescriptorProto::set_name(const ::std::string& value) { +void FieldDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name) } - void FieldDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.name) +} +#endif +void FieldDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.name) } - void FieldDescriptorProto::set_name(const char* value, size_t size) { +void FieldDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.name) } - ::std::string* FieldDescriptorProto::mutable_name() { +::std::string* FieldDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_name() { +::std::string* FieldDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_name(::std::string* name) { +void FieldDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -4983,23 +4943,23 @@ void FieldDescriptorProto::clear_name() { // optional int32 number = 3; bool FieldDescriptorProto::has_number() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } void FieldDescriptorProto::set_has_number() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000040u; } void FieldDescriptorProto::clear_has_number() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000040u; } void FieldDescriptorProto::clear_number() { number_ = 0; clear_has_number(); } - ::google::protobuf::int32 FieldDescriptorProto::number() const { +::google::protobuf::int32 FieldDescriptorProto::number() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.number) return number_; } - void FieldDescriptorProto::set_number(::google::protobuf::int32 value) { +void FieldDescriptorProto::set_number(::google::protobuf::int32 value) { set_has_number(); number_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number) @@ -5007,23 +4967,23 @@ void FieldDescriptorProto::clear_number() { // optional .google.protobuf.FieldDescriptorProto.Label label = 4; bool FieldDescriptorProto::has_label() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } void FieldDescriptorProto::set_has_label() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000100u; } void FieldDescriptorProto::clear_has_label() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000100u; } void FieldDescriptorProto::clear_label() { label_ = 1; clear_has_label(); } - ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const { +::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.label) return static_cast< ::google::protobuf::FieldDescriptorProto_Label >(label_); } - void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) { +void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) { assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value)); set_has_label(); label_ = value; @@ -5032,23 +4992,23 @@ void FieldDescriptorProto::clear_label() { // optional .google.protobuf.FieldDescriptorProto.Type type = 5; bool FieldDescriptorProto::has_type() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000200u) != 0; } void FieldDescriptorProto::set_has_type() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000200u; } void FieldDescriptorProto::clear_has_type() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000200u; } void FieldDescriptorProto::clear_type() { type_ = 1; clear_has_type(); } - ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const { +::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type) return static_cast< ::google::protobuf::FieldDescriptorProto_Type >(type_); } - void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) { +void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) { assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value)); set_has_type(); type_ = value; @@ -5057,49 +5017,57 @@ void FieldDescriptorProto::clear_type() { // optional string type_name = 6; bool FieldDescriptorProto::has_type_name() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void FieldDescriptorProto::set_has_type_name() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000002u; } void FieldDescriptorProto::clear_has_type_name() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000002u; } void FieldDescriptorProto::clear_type_name() { type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_type_name(); } - const ::std::string& FieldDescriptorProto::type_name() const { +const ::std::string& FieldDescriptorProto::type_name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name) - return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return type_name_.GetNoArena(); } - void FieldDescriptorProto::set_type_name(const ::std::string& value) { +void FieldDescriptorProto::set_type_name(const ::std::string& value) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name) } - void FieldDescriptorProto::set_type_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_type_name(::std::string&& value) { + set_has_type_name(); + type_name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.type_name) +} +#endif +void FieldDescriptorProto::set_type_name(const char* value) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.type_name) } - void FieldDescriptorProto::set_type_name(const char* value, size_t size) { +void FieldDescriptorProto::set_type_name(const char* value, size_t size) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.type_name) } - ::std::string* FieldDescriptorProto::mutable_type_name() { +::std::string* FieldDescriptorProto::mutable_type_name() { set_has_type_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.type_name) return type_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_type_name() { +::std::string* FieldDescriptorProto::release_type_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name) clear_has_type_name(); return type_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) { +void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) { if (type_name != NULL) { set_has_type_name(); } else { @@ -5111,49 +5079,57 @@ void FieldDescriptorProto::clear_type_name() { // optional string extendee = 2; bool FieldDescriptorProto::has_extendee() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FieldDescriptorProto::set_has_extendee() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00000004u; } void FieldDescriptorProto::clear_has_extendee() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00000004u; } void FieldDescriptorProto::clear_extendee() { extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_extendee(); } - const ::std::string& FieldDescriptorProto::extendee() const { +const ::std::string& FieldDescriptorProto::extendee() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee) - return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return extendee_.GetNoArena(); } - void FieldDescriptorProto::set_extendee(const ::std::string& value) { +void FieldDescriptorProto::set_extendee(const ::std::string& value) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee) } - void FieldDescriptorProto::set_extendee(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_extendee(::std::string&& value) { + set_has_extendee(); + extendee_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.extendee) +} +#endif +void FieldDescriptorProto::set_extendee(const char* value) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.extendee) } - void FieldDescriptorProto::set_extendee(const char* value, size_t size) { +void FieldDescriptorProto::set_extendee(const char* value, size_t size) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.extendee) } - ::std::string* FieldDescriptorProto::mutable_extendee() { +::std::string* FieldDescriptorProto::mutable_extendee() { set_has_extendee(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee) return extendee_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_extendee() { +::std::string* FieldDescriptorProto::release_extendee() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee) clear_has_extendee(); return extendee_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) { +void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) { if (extendee != NULL) { set_has_extendee(); } else { @@ -5165,49 +5141,57 @@ void FieldDescriptorProto::clear_extendee() { // optional string default_value = 7; bool FieldDescriptorProto::has_default_value() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FieldDescriptorProto::set_has_default_value() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000008u; } void FieldDescriptorProto::clear_has_default_value() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000008u; } void FieldDescriptorProto::clear_default_value() { default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_default_value(); } - const ::std::string& FieldDescriptorProto::default_value() const { +const ::std::string& FieldDescriptorProto::default_value() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value) - return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return default_value_.GetNoArena(); } - void FieldDescriptorProto::set_default_value(const ::std::string& value) { +void FieldDescriptorProto::set_default_value(const ::std::string& value) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value) } - void FieldDescriptorProto::set_default_value(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_default_value(::std::string&& value) { + set_has_default_value(); + default_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.default_value) +} +#endif +void FieldDescriptorProto::set_default_value(const char* value) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.default_value) } - void FieldDescriptorProto::set_default_value(const char* value, size_t size) { +void FieldDescriptorProto::set_default_value(const char* value, size_t size) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.default_value) } - ::std::string* FieldDescriptorProto::mutable_default_value() { +::std::string* FieldDescriptorProto::mutable_default_value() { set_has_default_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.default_value) return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_default_value() { +::std::string* FieldDescriptorProto::release_default_value() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value) clear_has_default_value(); return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) { +void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) { if (default_value != NULL) { set_has_default_value(); } else { @@ -5231,11 +5215,11 @@ void FieldDescriptorProto::clear_oneof_index() { oneof_index_ = 0; clear_has_oneof_index(); } - ::google::protobuf::int32 FieldDescriptorProto::oneof_index() const { +::google::protobuf::int32 FieldDescriptorProto::oneof_index() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.oneof_index) return oneof_index_; } - void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) { +void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) { set_has_oneof_index(); oneof_index_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index) @@ -5243,49 +5227,57 @@ void FieldDescriptorProto::clear_oneof_index() { // optional string json_name = 10; bool FieldDescriptorProto::has_json_name() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FieldDescriptorProto::set_has_json_name() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000010u; } void FieldDescriptorProto::clear_has_json_name() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000010u; } void FieldDescriptorProto::clear_json_name() { json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_json_name(); } - const ::std::string& FieldDescriptorProto::json_name() const { +const ::std::string& FieldDescriptorProto::json_name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name) - return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return json_name_.GetNoArena(); } - void FieldDescriptorProto::set_json_name(const ::std::string& value) { +void FieldDescriptorProto::set_json_name(const ::std::string& value) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name) } - void FieldDescriptorProto::set_json_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_json_name(::std::string&& value) { + set_has_json_name(); + json_name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.json_name) +} +#endif +void FieldDescriptorProto::set_json_name(const char* value) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.json_name) } - void FieldDescriptorProto::set_json_name(const char* value, size_t size) { +void FieldDescriptorProto::set_json_name(const char* value, size_t size) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.json_name) } - ::std::string* FieldDescriptorProto::mutable_json_name() { +::std::string* FieldDescriptorProto::mutable_json_name() { set_has_json_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.json_name) return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_json_name() { +::std::string* FieldDescriptorProto::release_json_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name) clear_has_json_name(); return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) { +void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) { if (json_name != NULL) { set_has_json_name(); } else { @@ -5297,13 +5289,13 @@ void FieldDescriptorProto::clear_json_name() { // optional .google.protobuf.FieldOptions options = 8; bool FieldDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } void FieldDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000020u; } void FieldDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000020u; } void FieldDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear(); @@ -5311,7 +5303,8 @@ void FieldDescriptorProto::clear_options() { } const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::FieldOptions::internal_default_instance(); } ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() { set_has_options(); @@ -5345,30 +5338,39 @@ void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOption #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int OneofDescriptorProto::kNameFieldNumber; +const int OneofDescriptorProto::kOptionsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 OneofDescriptorProto::OneofDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.OneofDescriptorProto) } - -void OneofDescriptorProto::InitAsDefaultInstance() { -} - OneofDescriptorProto::OneofDescriptorProto(const OneofDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::OneofOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofDescriptorProto) } void OneofDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + options_ = NULL; } OneofDescriptorProto::~OneofDescriptorProto() { @@ -5378,7 +5380,8 @@ OneofDescriptorProto::~OneofDescriptorProto() { void OneofDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { + delete options_; } } @@ -5389,16 +5392,14 @@ void OneofDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* OneofDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return OneofDescriptorProto_descriptor_; + return file_level_metadata[6].descriptor; } const OneofDescriptorProto& OneofDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -OneofDescriptorProto* OneofDescriptorProto::default_instance_ = NULL; - OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena) const { OneofDescriptorProto* n = new OneofDescriptorProto; if (arena != NULL) { @@ -5409,13 +5410,18 @@ OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena void OneofDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto) - if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_name()) { + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); + } + if (has_options()) { + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::OneofOptions::Clear(); + } } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool OneofDescriptorProto::MergePartialFromCodedStream( @@ -5424,13 +5430,13 @@ bool OneofDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.OneofDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5440,7 +5446,17 @@ bool OneofDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; + break; + } + + // optional .google.protobuf.OneofOptions options = 2; + case 2: { + if (tag == 18u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_options())); + } else { + goto handle_unusual; + } break; } @@ -5479,6 +5495,12 @@ void OneofDescriptorProto::SerializeWithCachedSizes( 1, this->name(), output); } + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, *this->options_, output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -5486,8 +5508,9 @@ void OneofDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.OneofDescriptorProto) } -::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* OneofDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofDescriptorProto) // optional string name = 1; if (has_name()) { @@ -5500,6 +5523,13 @@ ::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray 1, this->name(), target); } + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 2, *this->options_, false, target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -5508,32 +5538,42 @@ ::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray return target; } -int OneofDescriptorProto::ByteSize() const { +size_t OneofDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofDescriptorProto) - int total_size = 0; - - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + if (_has_bits_[0 / 32] & 3u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const OneofDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const OneofDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -5547,15 +5587,16 @@ void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void OneofDescriptorProto::MergeFrom(const OneofDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from.has_options()) { + mutable_options()->::google::protobuf::OneofOptions::MergeFrom(from.options()); + } } } @@ -5574,7 +5615,9 @@ void OneofDescriptorProto::CopyFrom(const OneofDescriptorProto& from) { } bool OneofDescriptorProto::IsInitialized() const { - + if (has_options()) { + if (!this->options_->IsInitialized()) return false; + } return true; } @@ -5584,6 +5627,7 @@ void OneofDescriptorProto::Swap(OneofDescriptorProto* other) { } void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) { name_.Swap(&other->name_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -5591,10 +5635,7 @@ void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) { ::google::protobuf::Metadata OneofDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = OneofDescriptorProto_descriptor_; - metadata.reflection = OneofDescriptorProto_reflection_; - return metadata; + return file_level_metadata[6]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -5614,37 +5655,45 @@ void OneofDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& OneofDescriptorProto::name() const { +const ::std::string& OneofDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void OneofDescriptorProto::set_name(const ::std::string& value) { +void OneofDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name) } - void OneofDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void OneofDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.OneofDescriptorProto.name) +} +#endif +void OneofDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.OneofDescriptorProto.name) } - void OneofDescriptorProto::set_name(const char* value, size_t size) { +void OneofDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.OneofDescriptorProto.name) } - ::std::string* OneofDescriptorProto::mutable_name() { +::std::string* OneofDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* OneofDescriptorProto::release_name() { +::std::string* OneofDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void OneofDescriptorProto::set_allocated_name(::std::string* name) { +void OneofDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -5654,6 +5703,51 @@ void OneofDescriptorProto::clear_name() { // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name) } +// optional .google.protobuf.OneofOptions options = 2; +bool OneofDescriptorProto::has_options() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void OneofDescriptorProto::set_has_options() { + _has_bits_[0] |= 0x00000002u; +} +void OneofDescriptorProto::clear_has_options() { + _has_bits_[0] &= ~0x00000002u; +} +void OneofDescriptorProto::clear_options() { + if (options_ != NULL) options_->::google::protobuf::OneofOptions::Clear(); + clear_has_options(); +} +const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() const { + // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.options) + return options_ != NULL ? *options_ + : *::google::protobuf::OneofOptions::internal_default_instance(); +} +::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options() { + set_has_options(); + if (options_ == NULL) { + options_ = new ::google::protobuf::OneofOptions; + } + // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.options) + return options_; +} +::google::protobuf::OneofOptions* OneofDescriptorProto::release_options() { + // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options) + clear_has_options(); + ::google::protobuf::OneofOptions* temp = options_; + options_ = NULL; + return temp; +} +void OneofDescriptorProto::set_allocated_options(::google::protobuf::OneofOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); + } else { + clear_has_options(); + } + // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.options) +} + #endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== @@ -5666,28 +5760,35 @@ const int EnumDescriptorProto::kOptionsFieldNumber; EnumDescriptorProto::EnumDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.EnumDescriptorProto) } - -void EnumDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::EnumOptions*>(&::google::protobuf::EnumOptions::default_instance()); -} - EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + value_(from.value_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::EnumOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto) } void EnumDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } EnumDescriptorProto::~EnumDescriptorProto() { @@ -5697,7 +5798,7 @@ EnumDescriptorProto::~EnumDescriptorProto() { void EnumDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -5709,16 +5810,14 @@ void EnumDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* EnumDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumDescriptorProto_descriptor_; + return file_level_metadata[7].descriptor; } const EnumDescriptorProto& EnumDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumDescriptorProto* EnumDescriptorProto::default_instance_ = NULL; - EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) const { EnumDescriptorProto* n = new EnumDescriptorProto; if (arena != NULL) { @@ -5729,19 +5828,19 @@ EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) void EnumDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto) - if (_has_bits_[0 / 32] & 5u) { + value_.Clear(); + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::EnumOptions::Clear(); } } - value_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool EnumDescriptorProto::MergePartialFromCodedStream( @@ -5750,13 +5849,13 @@ bool EnumDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.EnumDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5766,37 +5865,30 @@ bool EnumDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_value; break; } // repeated .google.protobuf.EnumValueDescriptorProto value = 2; case 2: { - if (tag == 18) { - parse_value: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_value: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_value())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_value; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.EnumOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -5854,8 +5946,9 @@ void EnumDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.EnumDescriptorProto) } -::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* EnumDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumDescriptorProto) // optional string name = 1; if (has_name()) { @@ -5871,15 +5964,15 @@ ::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.EnumValueDescriptorProto value = 2; for (unsigned int i = 0, n = this->value_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->value(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->value(i), false, target); } // optional .google.protobuf.EnumOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -5890,11 +5983,27 @@ ::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( return target; } -int EnumDescriptorProto::ByteSize() const { +size_t EnumDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumDescriptorProto) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.EnumValueDescriptorProto value = 2; + { + unsigned int count = this->value_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->value(i)); + } + } - if (_has_bits_[0 / 32] & 5u) { + if (_has_bits_[0 / 32] & 3u) { // optional string name = 1; if (has_name()) { total_size += 1 + @@ -5910,29 +6019,17 @@ int EnumDescriptorProto::ByteSize() const { } } - // repeated .google.protobuf.EnumValueDescriptorProto value = 2; - total_size += 1 * this->value_size(); - for (int i = 0; i < this->value_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->value(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const EnumDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -5946,9 +6043,10 @@ void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); value_.MergeFrom(from.value_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -5957,9 +6055,6 @@ void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) { mutable_options()->::google::protobuf::EnumOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void EnumDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -5977,7 +6072,6 @@ void EnumDescriptorProto::CopyFrom(const EnumDescriptorProto& from) { } bool EnumDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->value())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; @@ -5990,8 +6084,8 @@ void EnumDescriptorProto::Swap(EnumDescriptorProto* other) { InternalSwap(other); } void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) { - name_.Swap(&other->name_); value_.UnsafeArenaSwap(&other->value_); + name_.Swap(&other->name_); std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -6000,10 +6094,7 @@ void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) { ::google::protobuf::Metadata EnumDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumDescriptorProto_descriptor_; - metadata.reflection = EnumDescriptorProto_reflection_; - return metadata; + return file_level_metadata[7]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6023,37 +6114,45 @@ void EnumDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& EnumDescriptorProto::name() const { +const ::std::string& EnumDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void EnumDescriptorProto::set_name(const ::std::string& value) { +void EnumDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name) } - void EnumDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void EnumDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.EnumDescriptorProto.name) +} +#endif +void EnumDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.EnumDescriptorProto.name) } - void EnumDescriptorProto::set_name(const char* value, size_t size) { +void EnumDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumDescriptorProto.name) } - ::std::string* EnumDescriptorProto::mutable_name() { +::std::string* EnumDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* EnumDescriptorProto::release_name() { +::std::string* EnumDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void EnumDescriptorProto::set_allocated_name(::std::string* name) { +void EnumDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -6095,13 +6194,13 @@ EnumDescriptorProto::value() const { // optional .google.protobuf.EnumOptions options = 3; bool EnumDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void EnumDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void EnumDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void EnumDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear(); @@ -6109,7 +6208,8 @@ void EnumDescriptorProto::clear_options() { } const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::EnumOptions::internal_default_instance(); } ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() { set_has_options(); @@ -6149,29 +6249,36 @@ const int EnumValueDescriptorProto::kOptionsFieldNumber; EnumValueDescriptorProto::EnumValueDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.EnumValueDescriptorProto) } - -void EnumValueDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::EnumValueOptions*>(&::google::protobuf::EnumValueOptions::default_instance()); -} - EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::EnumValueOptions(*from.options_); + } else { + options_ = NULL; + } + number_ = from.number_; // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueDescriptorProto) } void EnumValueDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - number_ = 0; - options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&number_) - + reinterpret_cast(&options_) + sizeof(number_)); } EnumValueDescriptorProto::~EnumValueDescriptorProto() { @@ -6181,7 +6288,7 @@ EnumValueDescriptorProto::~EnumValueDescriptorProto() { void EnumValueDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -6193,16 +6300,14 @@ void EnumValueDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* EnumValueDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumValueDescriptorProto_descriptor_; + return file_level_metadata[8].descriptor; } const EnumValueDescriptorProto& EnumValueDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumValueDescriptorProto* EnumValueDescriptorProto::default_instance_ = NULL; - EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Arena* arena) const { EnumValueDescriptorProto* n = new EnumValueDescriptorProto; if (arena != NULL) { @@ -6213,19 +6318,19 @@ EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Aren void EnumValueDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto) - if (_has_bits_[0 / 32] & 7u) { + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } - number_ = 0; if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::EnumValueOptions::Clear(); } } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + number_ = 0; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool EnumValueDescriptorProto::MergePartialFromCodedStream( @@ -6234,13 +6339,13 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6250,35 +6355,30 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_number; break; } // optional int32 number = 2; case 2: { - if (tag == 16) { - parse_number: + if (tag == 16u) { + set_has_number(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &number_))); - set_has_number(); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.EnumValueOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -6335,8 +6435,9 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueDescriptorProto) } -::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* EnumValueDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueDescriptorProto) // optional string name = 1; if (has_name()) { @@ -6357,8 +6458,8 @@ ::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToA // optional .google.protobuf.EnumValueOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -6369,10 +6470,15 @@ ::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToA return target; } -int EnumValueDescriptorProto::ByteSize() const { +size_t EnumValueDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 7u) { // optional string name = 1; if (has_name()) { @@ -6381,13 +6487,6 @@ int EnumValueDescriptorProto::ByteSize() const { this->name()); } - // optional int32 number = 2; - if (has_number()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->number()); - } - // optional .google.protobuf.EnumValueOptions options = 3; if (has_options()) { total_size += 1 + @@ -6395,22 +6494,25 @@ int EnumValueDescriptorProto::ByteSize() const { *this->options_); } + // optional int32 number = 2; + if (has_number()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->number()); + } + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumValueDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const EnumValueDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -6424,21 +6526,19 @@ void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from void EnumValueDescriptorProto::MergeFrom(const EnumValueDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 7u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.has_number()) { - set_number(from.number()); - } if (from.has_options()) { mutable_options()->::google::protobuf::EnumValueOptions::MergeFrom(from.options()); } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from.has_number()) { + set_number(from.number()); + } } } @@ -6457,7 +6557,6 @@ void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) { } bool EnumValueDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -6470,8 +6569,8 @@ void EnumValueDescriptorProto::Swap(EnumValueDescriptorProto* other) { } void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) { name_.Swap(&other->name_); - std::swap(number_, other->number_); std::swap(options_, other->options_); + std::swap(number_, other->number_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -6479,10 +6578,7 @@ void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) { ::google::protobuf::Metadata EnumValueDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumValueDescriptorProto_descriptor_; - metadata.reflection = EnumValueDescriptorProto_reflection_; - return metadata; + return file_level_metadata[8]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6502,37 +6598,45 @@ void EnumValueDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& EnumValueDescriptorProto::name() const { +const ::std::string& EnumValueDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void EnumValueDescriptorProto::set_name(const ::std::string& value) { +void EnumValueDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name) } - void EnumValueDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void EnumValueDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.EnumValueDescriptorProto.name) +} +#endif +void EnumValueDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.EnumValueDescriptorProto.name) } - void EnumValueDescriptorProto::set_name(const char* value, size_t size) { +void EnumValueDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValueDescriptorProto.name) } - ::std::string* EnumValueDescriptorProto::mutable_name() { +::std::string* EnumValueDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* EnumValueDescriptorProto::release_name() { +::std::string* EnumValueDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void EnumValueDescriptorProto::set_allocated_name(::std::string* name) { +void EnumValueDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -6544,23 +6648,23 @@ void EnumValueDescriptorProto::clear_name() { // optional int32 number = 2; bool EnumValueDescriptorProto::has_number() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void EnumValueDescriptorProto::set_has_number() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } void EnumValueDescriptorProto::clear_has_number() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } void EnumValueDescriptorProto::clear_number() { number_ = 0; clear_has_number(); } - ::google::protobuf::int32 EnumValueDescriptorProto::number() const { +::google::protobuf::int32 EnumValueDescriptorProto::number() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.number) return number_; } - void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) { +void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) { set_has_number(); number_ = value; // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number) @@ -6568,13 +6672,13 @@ void EnumValueDescriptorProto::clear_number() { // optional .google.protobuf.EnumValueOptions options = 3; bool EnumValueDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void EnumValueDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void EnumValueDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void EnumValueDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear(); @@ -6582,7 +6686,8 @@ void EnumValueDescriptorProto::clear_options() { } const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::EnumValueOptions::internal_default_instance(); } ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() { set_has_options(); @@ -6622,28 +6727,35 @@ const int ServiceDescriptorProto::kOptionsFieldNumber; ServiceDescriptorProto::ServiceDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.ServiceDescriptorProto) } - -void ServiceDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::ServiceOptions*>(&::google::protobuf::ServiceOptions::default_instance()); -} - ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + method_(from.method_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::ServiceOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceDescriptorProto) } void ServiceDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } ServiceDescriptorProto::~ServiceDescriptorProto() { @@ -6653,7 +6765,7 @@ ServiceDescriptorProto::~ServiceDescriptorProto() { void ServiceDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -6665,16 +6777,14 @@ void ServiceDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* ServiceDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return ServiceDescriptorProto_descriptor_; + return file_level_metadata[9].descriptor; } const ServiceDescriptorProto& ServiceDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -ServiceDescriptorProto* ServiceDescriptorProto::default_instance_ = NULL; - ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* arena) const { ServiceDescriptorProto* n = new ServiceDescriptorProto; if (arena != NULL) { @@ -6685,19 +6795,19 @@ ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* a void ServiceDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto) - if (_has_bits_[0 / 32] & 5u) { + method_.Clear(); + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::ServiceOptions::Clear(); } } - method_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool ServiceDescriptorProto::MergePartialFromCodedStream( @@ -6706,13 +6816,13 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.ServiceDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6722,37 +6832,30 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_method; break; } // repeated .google.protobuf.MethodDescriptorProto method = 2; case 2: { - if (tag == 18) { - parse_method: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_method: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_method())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_method; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.ServiceOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -6810,8 +6913,9 @@ void ServiceDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceDescriptorProto) } -::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* ServiceDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceDescriptorProto) // optional string name = 1; if (has_name()) { @@ -6827,15 +6931,15 @@ ::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArr // repeated .google.protobuf.MethodDescriptorProto method = 2; for (unsigned int i = 0, n = this->method_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->method(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->method(i), false, target); } // optional .google.protobuf.ServiceOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -6846,11 +6950,27 @@ ::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArr return target; } -int ServiceDescriptorProto::ByteSize() const { +size_t ServiceDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceDescriptorProto) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.MethodDescriptorProto method = 2; + { + unsigned int count = this->method_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->method(i)); + } + } - if (_has_bits_[0 / 32] & 5u) { + if (_has_bits_[0 / 32] & 3u) { // optional string name = 1; if (has_name()) { total_size += 1 + @@ -6866,29 +6986,17 @@ int ServiceDescriptorProto::ByteSize() const { } } - // repeated .google.protobuf.MethodDescriptorProto method = 2; - total_size += 1 * this->method_size(); - for (int i = 0; i < this->method_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->method(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const ServiceDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const ServiceDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -6902,9 +7010,10 @@ void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); method_.MergeFrom(from.method_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -6913,9 +7022,6 @@ void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) { mutable_options()->::google::protobuf::ServiceOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void ServiceDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -6933,7 +7039,6 @@ void ServiceDescriptorProto::CopyFrom(const ServiceDescriptorProto& from) { } bool ServiceDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->method())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; @@ -6946,8 +7051,8 @@ void ServiceDescriptorProto::Swap(ServiceDescriptorProto* other) { InternalSwap(other); } void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) { - name_.Swap(&other->name_); method_.UnsafeArenaSwap(&other->method_); + name_.Swap(&other->name_); std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -6956,10 +7061,7 @@ void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) { ::google::protobuf::Metadata ServiceDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = ServiceDescriptorProto_descriptor_; - metadata.reflection = ServiceDescriptorProto_reflection_; - return metadata; + return file_level_metadata[9]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6979,37 +7081,45 @@ void ServiceDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& ServiceDescriptorProto::name() const { +const ::std::string& ServiceDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void ServiceDescriptorProto::set_name(const ::std::string& value) { +void ServiceDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name) } - void ServiceDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void ServiceDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.ServiceDescriptorProto.name) +} +#endif +void ServiceDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.ServiceDescriptorProto.name) } - void ServiceDescriptorProto::set_name(const char* value, size_t size) { +void ServiceDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.ServiceDescriptorProto.name) } - ::std::string* ServiceDescriptorProto::mutable_name() { +::std::string* ServiceDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* ServiceDescriptorProto::release_name() { +::std::string* ServiceDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void ServiceDescriptorProto::set_allocated_name(::std::string* name) { +void ServiceDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -7051,13 +7161,13 @@ ServiceDescriptorProto::method() const { // optional .google.protobuf.ServiceOptions options = 3; bool ServiceDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void ServiceDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void ServiceDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void ServiceDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear(); @@ -7065,7 +7175,8 @@ void ServiceDescriptorProto::clear_options() { } const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::ServiceOptions::internal_default_instance(); } ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() { set_has_options(); @@ -7108,32 +7219,48 @@ const int MethodDescriptorProto::kServerStreamingFieldNumber; MethodDescriptorProto::MethodDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.MethodDescriptorProto) } - -void MethodDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::MethodOptions*>(&::google::protobuf::MethodOptions::default_instance()); -} - MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_input_type()) { + input_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.input_type_); + } + output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_output_type()) { + output_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_type_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::MethodOptions(*from.options_); + } else { + options_ = NULL; + } + ::memcpy(&client_streaming_, &from.client_streaming_, + reinterpret_cast(&server_streaming_) - + reinterpret_cast(&client_streaming_) + sizeof(server_streaming_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodDescriptorProto) } void MethodDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - client_streaming_ = false; - server_streaming_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&server_streaming_) - + reinterpret_cast(&options_) + sizeof(server_streaming_)); } MethodDescriptorProto::~MethodDescriptorProto() { @@ -7145,7 +7272,7 @@ void MethodDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); input_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); output_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -7157,16 +7284,14 @@ void MethodDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* MethodDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return MethodDescriptorProto_descriptor_; + return file_level_metadata[10].descriptor; } const MethodDescriptorProto& MethodDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MethodDescriptorProto* MethodDescriptorProto::default_instance_ = NULL; - MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* arena) const { MethodDescriptorProto* n = new MethodDescriptorProto; if (arena != NULL) { @@ -7177,45 +7302,30 @@ MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* are void MethodDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(MethodDescriptorProto, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 63u) { - ZR_(client_streaming_, server_streaming_); + if (_has_bits_[0 / 32] & 15u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_input_type()) { - input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!input_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*input_type_.UnsafeRawStringPointer())->clear(); } if (has_output_type()) { - output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!output_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*output_type_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::MethodOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::MethodOptions::Clear(); } } - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 48u) { + ::memset(&client_streaming_, 0, reinterpret_cast(&server_streaming_) - + reinterpret_cast(&client_streaming_) + sizeof(server_streaming_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool MethodDescriptorProto::MergePartialFromCodedStream( @@ -7224,13 +7334,13 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.MethodDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7240,14 +7350,12 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_input_type; break; } // optional string input_type = 2; case 2: { - if (tag == 18) { - parse_input_type: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_input_type())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7257,14 +7365,12 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_output_type; break; } // optional string output_type = 3; case 3: { - if (tag == 26) { - parse_output_type: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_output_type())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7274,50 +7380,43 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_options; break; } // optional .google.protobuf.MethodOptions options = 4; case 4: { - if (tag == 34) { - parse_options: + if (tag == 34u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_client_streaming; break; } // optional bool client_streaming = 5 [default = false]; case 5: { - if (tag == 40) { - parse_client_streaming: + if (tag == 40u) { + set_has_client_streaming(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &client_streaming_))); - set_has_client_streaming(); } else { goto handle_unusual; } - if (input->ExpectTag(48)) goto parse_server_streaming; break; } // optional bool server_streaming = 6 [default = false]; case 6: { - if (tag == 48) { - parse_server_streaming: + if (tag == 48u) { + set_has_server_streaming(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &server_streaming_))); - set_has_server_streaming(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -7399,8 +7498,9 @@ void MethodDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.MethodDescriptorProto) } -::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* MethodDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodDescriptorProto) // optional string name = 1; if (has_name()) { @@ -7438,8 +7538,8 @@ ::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArra // optional .google.protobuf.MethodOptions options = 4; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 4, *this->options_, false, target); } // optional bool client_streaming = 5 [default = false]; @@ -7460,10 +7560,15 @@ ::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArra return target; } -int MethodDescriptorProto::ByteSize() const { +size_t MethodDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 63u) { // optional string name = 1; if (has_name()) { @@ -7504,21 +7609,17 @@ int MethodDescriptorProto::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MethodDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const MethodDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -7532,8 +7633,9 @@ void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 63u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -7556,9 +7658,6 @@ void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) { set_server_streaming(from.server_streaming()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void MethodDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -7576,7 +7675,6 @@ void MethodDescriptorProto::CopyFrom(const MethodDescriptorProto& from) { } bool MethodDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -7601,10 +7699,7 @@ void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) { ::google::protobuf::Metadata MethodDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MethodDescriptorProto_descriptor_; - metadata.reflection = MethodDescriptorProto_reflection_; - return metadata; + return file_level_metadata[10]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -7624,37 +7719,45 @@ void MethodDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& MethodDescriptorProto::name() const { +const ::std::string& MethodDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void MethodDescriptorProto::set_name(const ::std::string& value) { +void MethodDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name) } - void MethodDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.name) +} +#endif +void MethodDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.name) } - void MethodDescriptorProto::set_name(const char* value, size_t size) { +void MethodDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.name) } - ::std::string* MethodDescriptorProto::mutable_name() { +::std::string* MethodDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_name() { +::std::string* MethodDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_name(::std::string* name) { +void MethodDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -7678,37 +7781,45 @@ void MethodDescriptorProto::clear_input_type() { input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_input_type(); } - const ::std::string& MethodDescriptorProto::input_type() const { +const ::std::string& MethodDescriptorProto::input_type() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type) - return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return input_type_.GetNoArena(); } - void MethodDescriptorProto::set_input_type(const ::std::string& value) { +void MethodDescriptorProto::set_input_type(const ::std::string& value) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type) } - void MethodDescriptorProto::set_input_type(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_input_type(::std::string&& value) { + set_has_input_type(); + input_type_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.input_type) +} +#endif +void MethodDescriptorProto::set_input_type(const char* value) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.input_type) } - void MethodDescriptorProto::set_input_type(const char* value, size_t size) { +void MethodDescriptorProto::set_input_type(const char* value, size_t size) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.input_type) } - ::std::string* MethodDescriptorProto::mutable_input_type() { +::std::string* MethodDescriptorProto::mutable_input_type() { set_has_input_type(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.input_type) return input_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_input_type() { +::std::string* MethodDescriptorProto::release_input_type() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type) clear_has_input_type(); return input_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) { +void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) { if (input_type != NULL) { set_has_input_type(); } else { @@ -7732,37 +7843,45 @@ void MethodDescriptorProto::clear_output_type() { output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_output_type(); } - const ::std::string& MethodDescriptorProto::output_type() const { +const ::std::string& MethodDescriptorProto::output_type() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type) - return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return output_type_.GetNoArena(); } - void MethodDescriptorProto::set_output_type(const ::std::string& value) { +void MethodDescriptorProto::set_output_type(const ::std::string& value) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type) } - void MethodDescriptorProto::set_output_type(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_output_type(::std::string&& value) { + set_has_output_type(); + output_type_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.output_type) +} +#endif +void MethodDescriptorProto::set_output_type(const char* value) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.output_type) } - void MethodDescriptorProto::set_output_type(const char* value, size_t size) { +void MethodDescriptorProto::set_output_type(const char* value, size_t size) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.output_type) } - ::std::string* MethodDescriptorProto::mutable_output_type() { +::std::string* MethodDescriptorProto::mutable_output_type() { set_has_output_type(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.output_type) return output_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_output_type() { +::std::string* MethodDescriptorProto::release_output_type() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type) clear_has_output_type(); return output_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) { +void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) { if (output_type != NULL) { set_has_output_type(); } else { @@ -7788,7 +7907,8 @@ void MethodDescriptorProto::clear_options() { } const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::MethodOptions::internal_default_instance(); } ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() { set_has_options(); @@ -7830,11 +7950,11 @@ void MethodDescriptorProto::clear_client_streaming() { client_streaming_ = false; clear_has_client_streaming(); } - bool MethodDescriptorProto::client_streaming() const { +bool MethodDescriptorProto::client_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.client_streaming) return client_streaming_; } - void MethodDescriptorProto::set_client_streaming(bool value) { +void MethodDescriptorProto::set_client_streaming(bool value) { set_has_client_streaming(); client_streaming_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming) @@ -7854,11 +7974,11 @@ void MethodDescriptorProto::clear_server_streaming() { server_streaming_ = false; clear_has_server_streaming(); } - bool MethodDescriptorProto::server_streaming() const { +bool MethodDescriptorProto::server_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.server_streaming) return server_streaming_; } - void MethodDescriptorProto::set_server_streaming(bool value) { +void MethodDescriptorProto::set_server_streaming(bool value) { set_has_server_streaming(); server_streaming_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming) @@ -7868,29 +7988,6 @@ void MethodDescriptorProto::clear_server_streaming() { // =================================================================== -const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FileOptions_OptimizeMode_descriptor_; -} -bool FileOptions_OptimizeMode_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FileOptions_OptimizeMode FileOptions::SPEED; -const FileOptions_OptimizeMode FileOptions::CODE_SIZE; -const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME; -const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN; -const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX; -const int FileOptions::OptimizeMode_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FileOptions::kJavaPackageFieldNumber; const int FileOptions::kJavaOuterClassnameFieldNumber; @@ -7906,44 +8003,67 @@ const int FileOptions::kDeprecatedFieldNumber; const int FileOptions::kCcEnableArenasFieldNumber; const int FileOptions::kObjcClassPrefixFieldNumber; const int FileOptions::kCsharpNamespaceFieldNumber; +const int FileOptions::kSwiftPrefixFieldNumber; const int FileOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 FileOptions::FileOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileOptions) } - -void FileOptions::InitAsDefaultInstance() { -} - FileOptions::FileOptions(const FileOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_java_package()) { + java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_); + } + java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_java_outer_classname()) { + java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_); + } + go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_go_package()) { + go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); + } + objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_objc_class_prefix()) { + objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); + } + csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_csharp_namespace()) { + csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + } + swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_swift_prefix()) { + swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_); + } + ::memcpy(&java_multiple_files_, &from.java_multiple_files_, + reinterpret_cast(&optimize_for_) - + reinterpret_cast(&java_multiple_files_) + sizeof(optimize_for_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FileOptions) } void FileOptions::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - java_multiple_files_ = false; - java_generate_equals_and_hash_ = false; - java_string_check_utf8_ = false; - optimize_for_ = 1; go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - cc_generic_services_ = false; - java_generic_services_ = false; - py_generic_services_ = false; - deprecated_ = false; - cc_enable_arenas_ = false; objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(&java_multiple_files_, 0, reinterpret_cast(&cc_enable_arenas_) - + reinterpret_cast(&java_multiple_files_) + sizeof(cc_enable_arenas_)); + optimize_for_ = 1; } FileOptions::~FileOptions() { @@ -7957,8 +8077,7 @@ void FileOptions::SharedDtor() { go_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); objc_class_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); csharp_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } + swift_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void FileOptions::SetCachedSize(int size) const { @@ -7968,16 +8087,14 @@ void FileOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileOptions_descriptor_; + return file_level_metadata[11].descriptor; } const FileOptions& FileOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileOptions* FileOptions::default_instance_ = NULL; - FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const { FileOptions* n = new FileOptions; if (arena != NULL) { @@ -7989,53 +8106,44 @@ FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const { void FileOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(FileOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 255u) { - ZR_(java_multiple_files_, cc_generic_services_); + uninterpreted_option_.Clear(); + if (_has_bits_[0 / 32] & 63u) { if (has_java_package()) { - java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!java_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*java_package_.UnsafeRawStringPointer())->clear(); } if (has_java_outer_classname()) { - java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!java_outer_classname_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*java_outer_classname_.UnsafeRawStringPointer())->clear(); } - optimize_for_ = 1; if (has_go_package()) { - go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!go_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*go_package_.UnsafeRawStringPointer())->clear(); } - } - if (_has_bits_[8 / 32] & 16128u) { - ZR_(java_generic_services_, cc_enable_arenas_); if (has_objc_class_prefix()) { - objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!objc_class_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*objc_class_prefix_.UnsafeRawStringPointer())->clear(); } if (has_csharp_namespace()) { - csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!csharp_namespace_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*csharp_namespace_.UnsafeRawStringPointer())->clear(); + } + if (has_swift_prefix()) { + GOOGLE_DCHECK(!swift_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*swift_prefix_.UnsafeRawStringPointer())->clear(); } } - -#undef ZR_HELPER_ -#undef ZR_ - - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 192u) { + ::memset(&java_multiple_files_, 0, reinterpret_cast(&java_generate_equals_and_hash_) - + reinterpret_cast(&java_multiple_files_) + sizeof(java_generate_equals_and_hash_)); } + if (_has_bits_[8 / 32] & 32512u) { + ::memset(&java_string_check_utf8_, 0, reinterpret_cast(&cc_enable_arenas_) - + reinterpret_cast(&java_string_check_utf8_) + sizeof(cc_enable_arenas_)); + optimize_for_ = 1; + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileOptions::MergePartialFromCodedStream( @@ -8044,13 +8152,13 @@ bool FileOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string java_package = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_java_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8060,14 +8168,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_java_outer_classname; break; } // optional string java_outer_classname = 8; case 8: { - if (tag == 66) { - parse_java_outer_classname: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_java_outer_classname())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8077,14 +8183,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(72)) goto parse_optimize_for; break; } // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; case 9: { - if (tag == 72) { - parse_optimize_for: + if (tag == 72u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -8097,29 +8201,25 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_java_multiple_files; break; } // optional bool java_multiple_files = 10 [default = false]; case 10: { - if (tag == 80) { - parse_java_multiple_files: + if (tag == 80u) { + set_has_java_multiple_files(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_multiple_files_))); - set_has_java_multiple_files(); } else { goto handle_unusual; } - if (input->ExpectTag(90)) goto parse_go_package; break; } // optional string go_package = 11; case 11: { - if (tag == 90) { - parse_go_package: + if (tag == 90u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_go_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8129,119 +8229,103 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(128)) goto parse_cc_generic_services; break; } // optional bool cc_generic_services = 16 [default = false]; case 16: { - if (tag == 128) { - parse_cc_generic_services: + if (tag == 128u) { + set_has_cc_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &cc_generic_services_))); - set_has_cc_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(136)) goto parse_java_generic_services; break; } // optional bool java_generic_services = 17 [default = false]; case 17: { - if (tag == 136) { - parse_java_generic_services: + if (tag == 136u) { + set_has_java_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_generic_services_))); - set_has_java_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(144)) goto parse_py_generic_services; break; } // optional bool py_generic_services = 18 [default = false]; case 18: { - if (tag == 144) { - parse_py_generic_services: + if (tag == 144u) { + set_has_py_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &py_generic_services_))); - set_has_py_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(160)) goto parse_java_generate_equals_and_hash; break; } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; case 20: { - if (tag == 160) { - parse_java_generate_equals_and_hash: + if (tag == 160u) { + set_has_java_generate_equals_and_hash(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_generate_equals_and_hash_))); - set_has_java_generate_equals_and_hash(); } else { goto handle_unusual; } - if (input->ExpectTag(184)) goto parse_deprecated; break; } // optional bool deprecated = 23 [default = false]; case 23: { - if (tag == 184) { - parse_deprecated: + if (tag == 184u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(216)) goto parse_java_string_check_utf8; break; } // optional bool java_string_check_utf8 = 27 [default = false]; case 27: { - if (tag == 216) { - parse_java_string_check_utf8: + if (tag == 216u) { + set_has_java_string_check_utf8(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_string_check_utf8_))); - set_has_java_string_check_utf8(); } else { goto handle_unusual; } - if (input->ExpectTag(248)) goto parse_cc_enable_arenas; break; } // optional bool cc_enable_arenas = 31 [default = false]; case 31: { - if (tag == 248) { - parse_cc_enable_arenas: + if (tag == 248u) { + set_has_cc_enable_arenas(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &cc_enable_arenas_))); - set_has_cc_enable_arenas(); } else { goto handle_unusual; } - if (input->ExpectTag(290)) goto parse_objc_class_prefix; break; } // optional string objc_class_prefix = 36; case 36: { - if (tag == 290) { - parse_objc_class_prefix: + if (tag == 290u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_objc_class_prefix())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8251,14 +8335,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(298)) goto parse_csharp_namespace; break; } // optional string csharp_namespace = 37; case 37: { - if (tag == 298) { - parse_csharp_namespace: + if (tag == 298u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_csharp_namespace())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8268,24 +8350,34 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; + break; + } + + // optional string swift_prefix = 39; + case 39: { + if (tag == 314u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_swift_prefix())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.FileOptions.swift_prefix"); + } else { + goto handle_unusual; + } break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -8297,7 +8389,7 @@ bool FileOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -8375,7 +8467,7 @@ void FileOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(18, this->py_generic_services(), output); } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->java_generate_equals_and_hash(), output); } @@ -8415,6 +8507,16 @@ void FileOptions::SerializeWithCachedSizes( 37, this->csharp_namespace(), output); } + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.FileOptions.swift_prefix"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 39, this->swift_prefix(), output); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -8432,8 +8534,9 @@ void FileOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileOptions) } -::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileOptions) // optional string java_package = 1; if (has_java_package()) { @@ -8494,7 +8597,7 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(18, this->py_generic_services(), target); } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->java_generate_equals_and_hash(), target); } @@ -8536,16 +8639,27 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( 37, this->csharp_namespace(), target); } + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.FileOptions.swift_prefix"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 39, this->swift_prefix(), target); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -8555,9 +8669,27 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( return target; } -int FileOptions::ByteSize() const { +size_t FileOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 255u) { // optional string java_package = 1; @@ -8574,41 +8706,56 @@ int FileOptions::ByteSize() const { this->java_outer_classname()); } + // optional string go_package = 11; + if (has_go_package()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->go_package()); + } + + // optional string objc_class_prefix = 36; + if (has_objc_class_prefix()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->objc_class_prefix()); + } + + // optional string csharp_namespace = 37; + if (has_csharp_namespace()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->csharp_namespace()); + } + + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->swift_prefix()); + } + // optional bool java_multiple_files = 10 [default = false]; if (has_java_multiple_files()) { total_size += 1 + 1; } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { total_size += 2 + 1; } + } + if (_has_bits_[8 / 32] & 32512u) { // optional bool java_string_check_utf8 = 27 [default = false]; if (has_java_string_check_utf8()) { total_size += 2 + 1; } - // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; - if (has_optimize_for()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for()); - } - - // optional string go_package = 11; - if (has_go_package()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->go_package()); - } - // optional bool cc_generic_services = 16 [default = false]; if (has_cc_generic_services()) { total_size += 2 + 1; } - } - if (_has_bits_[8 / 32] & 16128u) { // optional bool java_generic_services = 17 [default = false]; if (has_java_generic_services()) { total_size += 2 + 1; @@ -8629,46 +8776,24 @@ int FileOptions::ByteSize() const { total_size += 2 + 1; } - // optional string objc_class_prefix = 36; - if (has_objc_class_prefix()) { - total_size += 2 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->objc_class_prefix()); - } - - // optional string csharp_namespace = 37; - if (has_csharp_namespace()) { - total_size += 2 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->csharp_namespace()); + // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; + if (has_optimize_for()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for()); } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const FileOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -8682,9 +8807,11 @@ void FileOptions::MergeFrom(const ::google::protobuf::Message& from) { void FileOptions::MergeFrom(const FileOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 255u) { if (from.has_java_package()) { set_has_java_package(); java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_); @@ -8693,27 +8820,36 @@ void FileOptions::MergeFrom(const FileOptions& from) { set_has_java_outer_classname(); java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_); } - if (from.has_java_multiple_files()) { + if (from.has_go_package()) { + set_has_go_package(); + go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); + } + if (from.has_objc_class_prefix()) { + set_has_objc_class_prefix(); + objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); + } + if (from.has_csharp_namespace()) { + set_has_csharp_namespace(); + csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + } + if (from.has_swift_prefix()) { + set_has_swift_prefix(); + swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_); + } + if (from.has_java_multiple_files()) { set_java_multiple_files(from.java_multiple_files()); } if (from.has_java_generate_equals_and_hash()) { set_java_generate_equals_and_hash(from.java_generate_equals_and_hash()); } + } + if (from._has_bits_[8 / 32] & 32512u) { if (from.has_java_string_check_utf8()) { set_java_string_check_utf8(from.java_string_check_utf8()); } - if (from.has_optimize_for()) { - set_optimize_for(from.optimize_for()); - } - if (from.has_go_package()) { - set_has_go_package(); - go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); - } if (from.has_cc_generic_services()) { set_cc_generic_services(from.cc_generic_services()); } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_java_generic_services()) { set_java_generic_services(from.java_generic_services()); } @@ -8726,19 +8862,10 @@ void FileOptions::MergeFrom(const FileOptions& from) { if (from.has_cc_enable_arenas()) { set_cc_enable_arenas(from.cc_enable_arenas()); } - if (from.has_objc_class_prefix()) { - set_has_objc_class_prefix(); - objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); - } - if (from.has_csharp_namespace()) { - set_has_csharp_namespace(); - csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + if (from.has_optimize_for()) { + set_optimize_for(from.optimize_for()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FileOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -8756,10 +8883,12 @@ void FileOptions::CopyFrom(const FileOptions& from) { } bool FileOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void FileOptions::Swap(FileOptions* other) { @@ -8767,21 +8896,22 @@ void FileOptions::Swap(FileOptions* other) { InternalSwap(other); } void FileOptions::InternalSwap(FileOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); java_package_.Swap(&other->java_package_); java_outer_classname_.Swap(&other->java_outer_classname_); + go_package_.Swap(&other->go_package_); + objc_class_prefix_.Swap(&other->objc_class_prefix_); + csharp_namespace_.Swap(&other->csharp_namespace_); + swift_prefix_.Swap(&other->swift_prefix_); std::swap(java_multiple_files_, other->java_multiple_files_); std::swap(java_generate_equals_and_hash_, other->java_generate_equals_and_hash_); std::swap(java_string_check_utf8_, other->java_string_check_utf8_); - std::swap(optimize_for_, other->optimize_for_); - go_package_.Swap(&other->go_package_); std::swap(cc_generic_services_, other->cc_generic_services_); std::swap(java_generic_services_, other->java_generic_services_); std::swap(py_generic_services_, other->py_generic_services_); std::swap(deprecated_, other->deprecated_); std::swap(cc_enable_arenas_, other->cc_enable_arenas_); - objc_class_prefix_.Swap(&other->objc_class_prefix_); - csharp_namespace_.Swap(&other->csharp_namespace_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(optimize_for_, other->optimize_for_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -8790,10 +8920,7 @@ void FileOptions::InternalSwap(FileOptions* other) { ::google::protobuf::Metadata FileOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileOptions_descriptor_; - metadata.reflection = FileOptions_reflection_; - return metadata; + return file_level_metadata[11]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -8813,37 +8940,45 @@ void FileOptions::clear_java_package() { java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_java_package(); } - const ::std::string& FileOptions::java_package() const { +const ::std::string& FileOptions::java_package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package) - return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return java_package_.GetNoArena(); } - void FileOptions::set_java_package(const ::std::string& value) { +void FileOptions::set_java_package(const ::std::string& value) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package) } - void FileOptions::set_java_package(const char* value) { +#if LANG_CXX11 +void FileOptions::set_java_package(::std::string&& value) { + set_has_java_package(); + java_package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.java_package) +} +#endif +void FileOptions::set_java_package(const char* value) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_package) } - void FileOptions::set_java_package(const char* value, size_t size) { +void FileOptions::set_java_package(const char* value, size_t size) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_package) } - ::std::string* FileOptions::mutable_java_package() { +::std::string* FileOptions::mutable_java_package() { set_has_java_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_package) return java_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_java_package() { +::std::string* FileOptions::release_java_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package) clear_has_java_package(); return java_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_java_package(::std::string* java_package) { +void FileOptions::set_allocated_java_package(::std::string* java_package) { if (java_package != NULL) { set_has_java_package(); } else { @@ -8867,37 +9002,45 @@ void FileOptions::clear_java_outer_classname() { java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_java_outer_classname(); } - const ::std::string& FileOptions::java_outer_classname() const { +const ::std::string& FileOptions::java_outer_classname() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname) - return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return java_outer_classname_.GetNoArena(); } - void FileOptions::set_java_outer_classname(const ::std::string& value) { +void FileOptions::set_java_outer_classname(const ::std::string& value) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname) } - void FileOptions::set_java_outer_classname(const char* value) { +#if LANG_CXX11 +void FileOptions::set_java_outer_classname(::std::string&& value) { + set_has_java_outer_classname(); + java_outer_classname_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.java_outer_classname) +} +#endif +void FileOptions::set_java_outer_classname(const char* value) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_outer_classname) } - void FileOptions::set_java_outer_classname(const char* value, size_t size) { +void FileOptions::set_java_outer_classname(const char* value, size_t size) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_outer_classname) } - ::std::string* FileOptions::mutable_java_outer_classname() { +::std::string* FileOptions::mutable_java_outer_classname() { set_has_java_outer_classname(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_outer_classname) return java_outer_classname_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_java_outer_classname() { +::std::string* FileOptions::release_java_outer_classname() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname) clear_has_java_outer_classname(); return java_outer_classname_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) { +void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) { if (java_outer_classname != NULL) { set_has_java_outer_classname(); } else { @@ -8909,47 +9052,47 @@ void FileOptions::clear_java_outer_classname() { // optional bool java_multiple_files = 10 [default = false]; bool FileOptions::has_java_multiple_files() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } void FileOptions::set_has_java_multiple_files() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000040u; } void FileOptions::clear_has_java_multiple_files() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000040u; } void FileOptions::clear_java_multiple_files() { java_multiple_files_ = false; clear_has_java_multiple_files(); } - bool FileOptions::java_multiple_files() const { +bool FileOptions::java_multiple_files() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files) return java_multiple_files_; } - void FileOptions::set_java_multiple_files(bool value) { +void FileOptions::set_java_multiple_files(bool value) { set_has_java_multiple_files(); java_multiple_files_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files) } -// optional bool java_generate_equals_and_hash = 20 [default = false]; +// optional bool java_generate_equals_and_hash = 20 [deprecated = true]; bool FileOptions::has_java_generate_equals_and_hash() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000080u) != 0; } void FileOptions::set_has_java_generate_equals_and_hash() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000080u; } void FileOptions::clear_has_java_generate_equals_and_hash() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000080u; } void FileOptions::clear_java_generate_equals_and_hash() { java_generate_equals_and_hash_ = false; clear_has_java_generate_equals_and_hash(); } - bool FileOptions::java_generate_equals_and_hash() const { +bool FileOptions::java_generate_equals_and_hash() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generate_equals_and_hash) return java_generate_equals_and_hash_; } - void FileOptions::set_java_generate_equals_and_hash(bool value) { +void FileOptions::set_java_generate_equals_and_hash(bool value) { set_has_java_generate_equals_and_hash(); java_generate_equals_and_hash_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash) @@ -8957,23 +9100,23 @@ void FileOptions::clear_java_generate_equals_and_hash() { // optional bool java_string_check_utf8 = 27 [default = false]; bool FileOptions::has_java_string_check_utf8() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } void FileOptions::set_has_java_string_check_utf8() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000100u; } void FileOptions::clear_has_java_string_check_utf8() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000100u; } void FileOptions::clear_java_string_check_utf8() { java_string_check_utf8_ = false; clear_has_java_string_check_utf8(); } - bool FileOptions::java_string_check_utf8() const { +bool FileOptions::java_string_check_utf8() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_string_check_utf8) return java_string_check_utf8_; } - void FileOptions::set_java_string_check_utf8(bool value) { +void FileOptions::set_java_string_check_utf8(bool value) { set_has_java_string_check_utf8(); java_string_check_utf8_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8) @@ -8981,23 +9124,23 @@ void FileOptions::clear_java_string_check_utf8() { // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; bool FileOptions::has_optimize_for() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00004000u) != 0; } void FileOptions::set_has_optimize_for() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00004000u; } void FileOptions::clear_has_optimize_for() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00004000u; } void FileOptions::clear_optimize_for() { optimize_for_ = 1; clear_has_optimize_for(); } - ::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const { +::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.optimize_for) return static_cast< ::google::protobuf::FileOptions_OptimizeMode >(optimize_for_); } - void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) { +void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) { assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value)); set_has_optimize_for(); optimize_for_ = value; @@ -9006,49 +9149,57 @@ void FileOptions::clear_optimize_for() { // optional string go_package = 11; bool FileOptions::has_go_package() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FileOptions::set_has_go_package() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000004u; } void FileOptions::clear_has_go_package() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000004u; } void FileOptions::clear_go_package() { go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_go_package(); } - const ::std::string& FileOptions::go_package() const { +const ::std::string& FileOptions::go_package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package) - return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return go_package_.GetNoArena(); } - void FileOptions::set_go_package(const ::std::string& value) { +void FileOptions::set_go_package(const ::std::string& value) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package) } - void FileOptions::set_go_package(const char* value) { +#if LANG_CXX11 +void FileOptions::set_go_package(::std::string&& value) { + set_has_go_package(); + go_package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.go_package) +} +#endif +void FileOptions::set_go_package(const char* value) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.go_package) } - void FileOptions::set_go_package(const char* value, size_t size) { +void FileOptions::set_go_package(const char* value, size_t size) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.go_package) } - ::std::string* FileOptions::mutable_go_package() { +::std::string* FileOptions::mutable_go_package() { set_has_go_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.go_package) return go_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_go_package() { +::std::string* FileOptions::release_go_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package) clear_has_go_package(); return go_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_go_package(::std::string* go_package) { +void FileOptions::set_allocated_go_package(::std::string* go_package) { if (go_package != NULL) { set_has_go_package(); } else { @@ -9060,23 +9211,23 @@ void FileOptions::clear_go_package() { // optional bool cc_generic_services = 16 [default = false]; bool FileOptions::has_cc_generic_services() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000200u) != 0; } void FileOptions::set_has_cc_generic_services() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000200u; } void FileOptions::clear_has_cc_generic_services() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000200u; } void FileOptions::clear_cc_generic_services() { cc_generic_services_ = false; clear_has_cc_generic_services(); } - bool FileOptions::cc_generic_services() const { +bool FileOptions::cc_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_generic_services) return cc_generic_services_; } - void FileOptions::set_cc_generic_services(bool value) { +void FileOptions::set_cc_generic_services(bool value) { set_has_cc_generic_services(); cc_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services) @@ -9084,23 +9235,23 @@ void FileOptions::clear_cc_generic_services() { // optional bool java_generic_services = 17 [default = false]; bool FileOptions::has_java_generic_services() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000400u) != 0; } void FileOptions::set_has_java_generic_services() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000400u; } void FileOptions::clear_has_java_generic_services() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000400u; } void FileOptions::clear_java_generic_services() { java_generic_services_ = false; clear_has_java_generic_services(); } - bool FileOptions::java_generic_services() const { +bool FileOptions::java_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generic_services) return java_generic_services_; } - void FileOptions::set_java_generic_services(bool value) { +void FileOptions::set_java_generic_services(bool value) { set_has_java_generic_services(); java_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services) @@ -9108,23 +9259,23 @@ void FileOptions::clear_java_generic_services() { // optional bool py_generic_services = 18 [default = false]; bool FileOptions::has_py_generic_services() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000800u) != 0; } void FileOptions::set_has_py_generic_services() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000800u; } void FileOptions::clear_has_py_generic_services() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000800u; } void FileOptions::clear_py_generic_services() { py_generic_services_ = false; clear_has_py_generic_services(); } - bool FileOptions::py_generic_services() const { +bool FileOptions::py_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.py_generic_services) return py_generic_services_; } - void FileOptions::set_py_generic_services(bool value) { +void FileOptions::set_py_generic_services(bool value) { set_has_py_generic_services(); py_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services) @@ -9132,23 +9283,23 @@ void FileOptions::clear_py_generic_services() { // optional bool deprecated = 23 [default = false]; bool FileOptions::has_deprecated() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00001000u) != 0; } void FileOptions::set_has_deprecated() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00001000u; } void FileOptions::clear_has_deprecated() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00001000u; } void FileOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool FileOptions::deprecated() const { +bool FileOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated) return deprecated_; } - void FileOptions::set_deprecated(bool value) { +void FileOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated) @@ -9156,23 +9307,23 @@ void FileOptions::clear_deprecated() { // optional bool cc_enable_arenas = 31 [default = false]; bool FileOptions::has_cc_enable_arenas() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00002000u) != 0; } void FileOptions::set_has_cc_enable_arenas() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00002000u; } void FileOptions::clear_has_cc_enable_arenas() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00002000u; } void FileOptions::clear_cc_enable_arenas() { cc_enable_arenas_ = false; clear_has_cc_enable_arenas(); } - bool FileOptions::cc_enable_arenas() const { +bool FileOptions::cc_enable_arenas() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_enable_arenas) return cc_enable_arenas_; } - void FileOptions::set_cc_enable_arenas(bool value) { +void FileOptions::set_cc_enable_arenas(bool value) { set_has_cc_enable_arenas(); cc_enable_arenas_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas) @@ -9180,49 +9331,57 @@ void FileOptions::clear_cc_enable_arenas() { // optional string objc_class_prefix = 36; bool FileOptions::has_objc_class_prefix() const { - return (_has_bits_[0] & 0x00001000u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FileOptions::set_has_objc_class_prefix() { - _has_bits_[0] |= 0x00001000u; + _has_bits_[0] |= 0x00000008u; } void FileOptions::clear_has_objc_class_prefix() { - _has_bits_[0] &= ~0x00001000u; + _has_bits_[0] &= ~0x00000008u; } void FileOptions::clear_objc_class_prefix() { objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_objc_class_prefix(); } - const ::std::string& FileOptions::objc_class_prefix() const { +const ::std::string& FileOptions::objc_class_prefix() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix) - return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return objc_class_prefix_.GetNoArena(); } - void FileOptions::set_objc_class_prefix(const ::std::string& value) { +void FileOptions::set_objc_class_prefix(const ::std::string& value) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix) } - void FileOptions::set_objc_class_prefix(const char* value) { +#if LANG_CXX11 +void FileOptions::set_objc_class_prefix(::std::string&& value) { + set_has_objc_class_prefix(); + objc_class_prefix_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.objc_class_prefix) +} +#endif +void FileOptions::set_objc_class_prefix(const char* value) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.objc_class_prefix) } - void FileOptions::set_objc_class_prefix(const char* value, size_t size) { +void FileOptions::set_objc_class_prefix(const char* value, size_t size) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.objc_class_prefix) } - ::std::string* FileOptions::mutable_objc_class_prefix() { +::std::string* FileOptions::mutable_objc_class_prefix() { set_has_objc_class_prefix(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.objc_class_prefix) return objc_class_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_objc_class_prefix() { +::std::string* FileOptions::release_objc_class_prefix() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix) clear_has_objc_class_prefix(); return objc_class_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) { +void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) { if (objc_class_prefix != NULL) { set_has_objc_class_prefix(); } else { @@ -9234,49 +9393,57 @@ void FileOptions::clear_objc_class_prefix() { // optional string csharp_namespace = 37; bool FileOptions::has_csharp_namespace() const { - return (_has_bits_[0] & 0x00002000u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FileOptions::set_has_csharp_namespace() { - _has_bits_[0] |= 0x00002000u; + _has_bits_[0] |= 0x00000010u; } void FileOptions::clear_has_csharp_namespace() { - _has_bits_[0] &= ~0x00002000u; + _has_bits_[0] &= ~0x00000010u; } void FileOptions::clear_csharp_namespace() { csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_csharp_namespace(); } - const ::std::string& FileOptions::csharp_namespace() const { +const ::std::string& FileOptions::csharp_namespace() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace) - return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return csharp_namespace_.GetNoArena(); } - void FileOptions::set_csharp_namespace(const ::std::string& value) { +void FileOptions::set_csharp_namespace(const ::std::string& value) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace) } - void FileOptions::set_csharp_namespace(const char* value) { +#if LANG_CXX11 +void FileOptions::set_csharp_namespace(::std::string&& value) { + set_has_csharp_namespace(); + csharp_namespace_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.csharp_namespace) +} +#endif +void FileOptions::set_csharp_namespace(const char* value) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_namespace) } - void FileOptions::set_csharp_namespace(const char* value, size_t size) { +void FileOptions::set_csharp_namespace(const char* value, size_t size) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_namespace) } - ::std::string* FileOptions::mutable_csharp_namespace() { +::std::string* FileOptions::mutable_csharp_namespace() { set_has_csharp_namespace(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_namespace) return csharp_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_csharp_namespace() { +::std::string* FileOptions::release_csharp_namespace() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace) clear_has_csharp_namespace(); return csharp_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) { +void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) { if (csharp_namespace != NULL) { set_has_csharp_namespace(); } else { @@ -9286,6 +9453,68 @@ void FileOptions::clear_csharp_namespace() { // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace) } +// optional string swift_prefix = 39; +bool FileOptions::has_swift_prefix() const { + return (_has_bits_[0] & 0x00000020u) != 0; +} +void FileOptions::set_has_swift_prefix() { + _has_bits_[0] |= 0x00000020u; +} +void FileOptions::clear_has_swift_prefix() { + _has_bits_[0] &= ~0x00000020u; +} +void FileOptions::clear_swift_prefix() { + swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_swift_prefix(); +} +const ::std::string& FileOptions::swift_prefix() const { + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix) + return swift_prefix_.GetNoArena(); +} +void FileOptions::set_swift_prefix(const ::std::string& value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix) +} +#if LANG_CXX11 +void FileOptions::set_swift_prefix(::std::string&& value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.swift_prefix) +} +#endif +void FileOptions::set_swift_prefix(const char* value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix) +} +void FileOptions::set_swift_prefix(const char* value, size_t size) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix) +} +::std::string* FileOptions::mutable_swift_prefix() { + set_has_swift_prefix(); + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix) + return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* FileOptions::release_swift_prefix() { + // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix) + clear_has_swift_prefix(); + return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) { + if (swift_prefix != NULL) { + set_has_swift_prefix(); + } else { + clear_has_swift_prefix(); + } + swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix) +} + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; int FileOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); @@ -9330,28 +9559,30 @@ const int MessageOptions::kUninterpretedOptionFieldNumber; MessageOptions::MessageOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.MessageOptions) } - -void MessageOptions::InitAsDefaultInstance() { -} - MessageOptions::MessageOptions(const MessageOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&message_set_wire_format_, &from.message_set_wire_format_, + reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions) } void MessageOptions::SharedCtor() { _cached_size_ = 0; - message_set_wire_format_ = false; - no_standard_descriptor_accessor_ = false; - deprecated_ = false; - map_entry_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&message_set_wire_format_, 0, reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); } MessageOptions::~MessageOptions() { @@ -9360,8 +9591,6 @@ MessageOptions::~MessageOptions() { } void MessageOptions::SharedDtor() { - if (this != default_instance_) { - } } void MessageOptions::SetCachedSize(int size) const { @@ -9371,16 +9600,14 @@ void MessageOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* MessageOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return MessageOptions_descriptor_; + return file_level_metadata[12].descriptor; } const MessageOptions& MessageOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MessageOptions* MessageOptions::default_instance_ = NULL; - MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const { MessageOptions* n = new MessageOptions; if (arena != NULL) { @@ -9392,32 +9619,13 @@ MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const { void MessageOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(MessageOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(message_set_wire_format_, map_entry_); - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 15u) { + ::memset(&message_set_wire_format_, 0, reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool MessageOptions::MergePartialFromCodedStream( @@ -9426,83 +9634,72 @@ bool MessageOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.MessageOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional bool message_set_wire_format = 1 [default = false]; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_message_set_wire_format(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &message_set_wire_format_))); - set_has_message_set_wire_format(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_no_standard_descriptor_accessor; break; } // optional bool no_standard_descriptor_accessor = 2 [default = false]; case 2: { - if (tag == 16) { - parse_no_standard_descriptor_accessor: + if (tag == 16u) { + set_has_no_standard_descriptor_accessor(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &no_standard_descriptor_accessor_))); - set_has_no_standard_descriptor_accessor(); } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_deprecated; break; } // optional bool deprecated = 3 [default = false]; case 3: { - if (tag == 24) { - parse_deprecated: + if (tag == 24u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(56)) goto parse_map_entry; break; } // optional bool map_entry = 7; case 7: { - if (tag == 56) { - parse_map_entry: + if (tag == 56u) { + set_has_map_entry(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &map_entry_))); - set_has_map_entry(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -9514,7 +9711,7 @@ bool MessageOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -9573,8 +9770,9 @@ void MessageOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.MessageOptions) } -::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* MessageOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MessageOptions) // optional bool message_set_wire_format = 1 [default = false]; if (has_message_set_wire_format()) { @@ -9599,13 +9797,13 @@ ::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -9615,9 +9813,27 @@ ::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( return target; } -int MessageOptions::ByteSize() const { +size_t MessageOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.MessageOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 15u) { // optional bool message_set_wire_format = 1 [default = false]; @@ -9641,31 +9857,17 @@ int MessageOptions::ByteSize() const { } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MessageOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MessageOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const MessageOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -9679,9 +9881,11 @@ void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) { void MessageOptions::MergeFrom(const MessageOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MessageOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 15u) { if (from.has_message_set_wire_format()) { set_message_set_wire_format(from.message_set_wire_format()); } @@ -9695,10 +9899,6 @@ void MessageOptions::MergeFrom(const MessageOptions& from) { set_map_entry(from.map_entry()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void MessageOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -9716,10 +9916,12 @@ void MessageOptions::CopyFrom(const MessageOptions& from) { } bool MessageOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void MessageOptions::Swap(MessageOptions* other) { @@ -9727,11 +9929,11 @@ void MessageOptions::Swap(MessageOptions* other) { InternalSwap(other); } void MessageOptions::InternalSwap(MessageOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(message_set_wire_format_, other->message_set_wire_format_); std::swap(no_standard_descriptor_accessor_, other->no_standard_descriptor_accessor_); std::swap(deprecated_, other->deprecated_); std::swap(map_entry_, other->map_entry_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -9740,10 +9942,7 @@ void MessageOptions::InternalSwap(MessageOptions* other) { ::google::protobuf::Metadata MessageOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MessageOptions_descriptor_; - metadata.reflection = MessageOptions_reflection_; - return metadata; + return file_level_metadata[12]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -9763,11 +9962,11 @@ void MessageOptions::clear_message_set_wire_format() { message_set_wire_format_ = false; clear_has_message_set_wire_format(); } - bool MessageOptions::message_set_wire_format() const { +bool MessageOptions::message_set_wire_format() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.message_set_wire_format) return message_set_wire_format_; } - void MessageOptions::set_message_set_wire_format(bool value) { +void MessageOptions::set_message_set_wire_format(bool value) { set_has_message_set_wire_format(); message_set_wire_format_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format) @@ -9787,11 +9986,11 @@ void MessageOptions::clear_no_standard_descriptor_accessor() { no_standard_descriptor_accessor_ = false; clear_has_no_standard_descriptor_accessor(); } - bool MessageOptions::no_standard_descriptor_accessor() const { +bool MessageOptions::no_standard_descriptor_accessor() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.no_standard_descriptor_accessor) return no_standard_descriptor_accessor_; } - void MessageOptions::set_no_standard_descriptor_accessor(bool value) { +void MessageOptions::set_no_standard_descriptor_accessor(bool value) { set_has_no_standard_descriptor_accessor(); no_standard_descriptor_accessor_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor) @@ -9811,11 +10010,11 @@ void MessageOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool MessageOptions::deprecated() const { +bool MessageOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated) return deprecated_; } - void MessageOptions::set_deprecated(bool value) { +void MessageOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated) @@ -9835,11 +10034,11 @@ void MessageOptions::clear_map_entry() { map_entry_ = false; clear_has_map_entry(); } - bool MessageOptions::map_entry() const { +bool MessageOptions::map_entry() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.map_entry) return map_entry_; } - void MessageOptions::set_map_entry(bool value) { +void MessageOptions::set_map_entry(bool value) { set_has_map_entry(); map_entry_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry) @@ -9879,52 +10078,6 @@ MessageOptions::uninterpreted_option() const { // =================================================================== -const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldOptions_CType_descriptor_; -} -bool FieldOptions_CType_IsValid(int value) { - switch(value) { - case 0: - case 1: - case 2: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldOptions_CType FieldOptions::STRING; -const FieldOptions_CType FieldOptions::CORD; -const FieldOptions_CType FieldOptions::STRING_PIECE; -const FieldOptions_CType FieldOptions::CType_MIN; -const FieldOptions_CType FieldOptions::CType_MAX; -const int FieldOptions::CType_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldOptions_JSType_descriptor_; -} -bool FieldOptions_JSType_IsValid(int value) { - switch(value) { - case 0: - case 1: - case 2: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldOptions_JSType FieldOptions::JS_NORMAL; -const FieldOptions_JSType FieldOptions::JS_STRING; -const FieldOptions_JSType FieldOptions::JS_NUMBER; -const FieldOptions_JSType FieldOptions::JSType_MIN; -const FieldOptions_JSType FieldOptions::JSType_MAX; -const int FieldOptions::JSType_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FieldOptions::kCtypeFieldNumber; const int FieldOptions::kPackedFieldNumber; @@ -9937,30 +10090,30 @@ const int FieldOptions::kUninterpretedOptionFieldNumber; FieldOptions::FieldOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FieldOptions) } - -void FieldOptions::InitAsDefaultInstance() { -} - FieldOptions::FieldOptions(const FieldOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&ctype_, &from.ctype_, + reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions) } void FieldOptions::SharedCtor() { _cached_size_ = 0; - ctype_ = 0; - packed_ = false; - jstype_ = 0; - lazy_ = false; - deprecated_ = false; - weak_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&ctype_, 0, reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); } FieldOptions::~FieldOptions() { @@ -9969,8 +10122,6 @@ FieldOptions::~FieldOptions() { } void FieldOptions::SharedDtor() { - if (this != default_instance_) { - } } void FieldOptions::SetCachedSize(int size) const { @@ -9980,16 +10131,14 @@ void FieldOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FieldOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return FieldOptions_descriptor_; + return file_level_metadata[13].descriptor; } const FieldOptions& FieldOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FieldOptions* FieldOptions::default_instance_ = NULL; - FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const { FieldOptions* n = new FieldOptions; if (arena != NULL) { @@ -10001,35 +10150,13 @@ FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const { void FieldOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(FieldOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 63u) { - ZR_(ctype_, jstype_); - ZR_(packed_, weak_); - } - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 63u) { + ::memset(&ctype_, 0, reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FieldOptions::MergePartialFromCodedStream( @@ -10038,13 +10165,13 @@ bool FieldOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FieldOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; case 1: { - if (tag == 8) { + if (tag == 8u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -10057,59 +10184,51 @@ bool FieldOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_packed; break; } // optional bool packed = 2; case 2: { - if (tag == 16) { - parse_packed: + if (tag == 16u) { + set_has_packed(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &packed_))); - set_has_packed(); } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_deprecated; break; } // optional bool deprecated = 3 [default = false]; case 3: { - if (tag == 24) { - parse_deprecated: + if (tag == 24u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_lazy; break; } // optional bool lazy = 5 [default = false]; case 5: { - if (tag == 40) { - parse_lazy: + if (tag == 40u) { + set_has_lazy(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &lazy_))); - set_has_lazy(); } else { goto handle_unusual; } - if (input->ExpectTag(48)) goto parse_jstype; break; } // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; case 6: { - if (tag == 48) { - parse_jstype: + if (tag == 48u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -10122,39 +10241,32 @@ bool FieldOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_weak; break; } // optional bool weak = 10 [default = false]; case 10: { - if (tag == 80) { - parse_weak: + if (tag == 80u) { + set_has_weak(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &weak_))); - set_has_weak(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -10166,7 +10278,7 @@ bool FieldOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -10237,8 +10349,9 @@ void FieldOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FieldOptions) } -::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FieldOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldOptions) // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; if (has_ctype()) { @@ -10275,13 +10388,13 @@ ::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -10291,9 +10404,27 @@ ::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( return target; } -int FieldOptions::ByteSize() const { +size_t FieldOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 63u) { // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; @@ -10302,17 +10433,17 @@ int FieldOptions::ByteSize() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->ctype()); } - // optional bool packed = 2; - if (has_packed()) { - total_size += 1 + 1; - } - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; if (has_jstype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->jstype()); } + // optional bool packed = 2; + if (has_packed()) { + total_size += 1 + 1; + } + // optional bool lazy = 5 [default = false]; if (has_lazy()) { total_size += 1 + 1; @@ -10329,31 +10460,17 @@ int FieldOptions::ByteSize() const { } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FieldOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const FieldOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -10367,18 +10484,20 @@ void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) { void FieldOptions::MergeFrom(const FieldOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 63u) { if (from.has_ctype()) { set_ctype(from.ctype()); } - if (from.has_packed()) { - set_packed(from.packed()); - } if (from.has_jstype()) { set_jstype(from.jstype()); } + if (from.has_packed()) { + set_packed(from.packed()); + } if (from.has_lazy()) { set_lazy(from.lazy()); } @@ -10389,10 +10508,6 @@ void FieldOptions::MergeFrom(const FieldOptions& from) { set_weak(from.weak()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FieldOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -10410,10 +10525,12 @@ void FieldOptions::CopyFrom(const FieldOptions& from) { } bool FieldOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void FieldOptions::Swap(FieldOptions* other) { @@ -10421,13 +10538,13 @@ void FieldOptions::Swap(FieldOptions* other) { InternalSwap(other); } void FieldOptions::InternalSwap(FieldOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(ctype_, other->ctype_); - std::swap(packed_, other->packed_); std::swap(jstype_, other->jstype_); + std::swap(packed_, other->packed_); std::swap(lazy_, other->lazy_); std::swap(deprecated_, other->deprecated_); std::swap(weak_, other->weak_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -10436,10 +10553,7 @@ void FieldOptions::InternalSwap(FieldOptions* other) { ::google::protobuf::Metadata FieldOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FieldOptions_descriptor_; - metadata.reflection = FieldOptions_reflection_; - return metadata; + return file_level_metadata[13]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -10459,11 +10573,11 @@ void FieldOptions::clear_ctype() { ctype_ = 0; clear_has_ctype(); } - ::google::protobuf::FieldOptions_CType FieldOptions::ctype() const { +::google::protobuf::FieldOptions_CType FieldOptions::ctype() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.ctype) return static_cast< ::google::protobuf::FieldOptions_CType >(ctype_); } - void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) { +void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) { assert(::google::protobuf::FieldOptions_CType_IsValid(value)); set_has_ctype(); ctype_ = value; @@ -10472,23 +10586,23 @@ void FieldOptions::clear_ctype() { // optional bool packed = 2; bool FieldOptions::has_packed() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FieldOptions::set_has_packed() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } void FieldOptions::clear_has_packed() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } void FieldOptions::clear_packed() { packed_ = false; clear_has_packed(); } - bool FieldOptions::packed() const { +bool FieldOptions::packed() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed) return packed_; } - void FieldOptions::set_packed(bool value) { +void FieldOptions::set_packed(bool value) { set_has_packed(); packed_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed) @@ -10496,23 +10610,23 @@ void FieldOptions::clear_packed() { // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; bool FieldOptions::has_jstype() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void FieldOptions::set_has_jstype() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void FieldOptions::clear_has_jstype() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void FieldOptions::clear_jstype() { jstype_ = 0; clear_has_jstype(); } - ::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const { +::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.jstype) return static_cast< ::google::protobuf::FieldOptions_JSType >(jstype_); } - void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) { +void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) { assert(::google::protobuf::FieldOptions_JSType_IsValid(value)); set_has_jstype(); jstype_ = value; @@ -10533,11 +10647,11 @@ void FieldOptions::clear_lazy() { lazy_ = false; clear_has_lazy(); } - bool FieldOptions::lazy() const { +bool FieldOptions::lazy() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy) return lazy_; } - void FieldOptions::set_lazy(bool value) { +void FieldOptions::set_lazy(bool value) { set_has_lazy(); lazy_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy) @@ -10557,11 +10671,11 @@ void FieldOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool FieldOptions::deprecated() const { +bool FieldOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated) return deprecated_; } - void FieldOptions::set_deprecated(bool value) { +void FieldOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated) @@ -10581,11 +10695,11 @@ void FieldOptions::clear_weak() { weak_ = false; clear_has_weak(); } - bool FieldOptions::weak() const { +bool FieldOptions::weak() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak) return weak_; } - void FieldOptions::set_weak(bool value) { +void FieldOptions::set_weak(bool value) { set_has_weak(); weak_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak) @@ -10626,154 +10740,91 @@ FieldOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EnumOptions::kAllowAliasFieldNumber; -const int EnumOptions::kDeprecatedFieldNumber; -const int EnumOptions::kUninterpretedOptionFieldNumber; +const int OneofOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EnumOptions::EnumOptions() +OneofOptions::OneofOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions) + // @@protoc_insertion_point(constructor:google.protobuf.OneofOptions) } - -void EnumOptions::InitAsDefaultInstance() { -} - -EnumOptions::EnumOptions(const EnumOptions& from) +OneofOptions::OneofOptions(const OneofOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofOptions) } -void EnumOptions::SharedCtor() { +void OneofOptions::SharedCtor() { _cached_size_ = 0; - allow_alias_ = false; - deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -EnumOptions::~EnumOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions) +OneofOptions::~OneofOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.OneofOptions) SharedDtor(); } -void EnumOptions::SharedDtor() { - if (this != default_instance_) { - } +void OneofOptions::SharedDtor() { } -void EnumOptions::SetCachedSize(int size) const { +void OneofOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* EnumOptions::descriptor() { +const ::google::protobuf::Descriptor* OneofOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumOptions_descriptor_; + return file_level_metadata[14].descriptor; } -const EnumOptions& EnumOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const OneofOptions& OneofOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumOptions* EnumOptions::default_instance_ = NULL; - -EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const { - EnumOptions* n = new EnumOptions; +OneofOptions* OneofOptions::New(::google::protobuf::Arena* arena) const { + OneofOptions* n = new OneofOptions; if (arena != NULL) { arena->Own(n); } return n; } -void EnumOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) +void OneofOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(EnumOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(allow_alias_, deprecated_); - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool EnumOptions::MergePartialFromCodedStream( +bool OneofOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.OneofOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool allow_alias = 2; - case 2: { - if (tag == 16) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &allow_alias_))); - set_has_allow_alias(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(24)) goto parse_deprecated; - break; - } - - // optional bool deprecated = 3 [default = false]; - case 3: { - if (tag == 24) { - parse_deprecated: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &deprecated_))); - set_has_deprecated(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; - break; - } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -10785,7 +10836,7 @@ bool EnumOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -10796,27 +10847,17 @@ bool EnumOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.OneofOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.OneofOptions) return false; #undef DO_ } -void EnumOptions::SerializeWithCachedSizes( +void OneofOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions) - // optional bool allow_alias = 2; - if (has_allow_alias()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output); - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output); - } - + // @@protoc_insertion_point(serialize_start:google.protobuf.OneofOptions) // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -10831,64 +10872,35 @@ void EnumOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.OneofOptions) } -::google::protobuf::uint8* EnumOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions) - // optional bool allow_alias = 2; - if (has_allow_alias()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target); - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target); - } - +::google::protobuf::uint8* OneofOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofOptions) // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofOptions) return target; } -int EnumOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions) - int total_size = 0; - - if (_has_bits_[0 / 32] & 3u) { - // optional bool allow_alias = 2; - if (has_allow_alias()) { - total_size += 1 + 1; - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - total_size += 1 + 1; - } - - } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t OneofOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -10897,73 +10909,75 @@ int EnumOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void OneofOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofOptions) + GOOGLE_DCHECK_NE(&from, this); + const OneofOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.OneofOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.OneofOptions) MergeFrom(*source); } } -void EnumOptions::MergeFrom(const EnumOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_allow_alias()) { - set_allow_alias(from.allow_alias()); - } - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void OneofOptions::MergeFrom(const OneofOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); } -void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions) +void OneofOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.OneofOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void EnumOptions::CopyFrom(const EnumOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions) +void OneofOptions::CopyFrom(const OneofOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.OneofOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool EnumOptions::IsInitialized() const { +bool OneofOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void EnumOptions::Swap(EnumOptions* other) { +void OneofOptions::Swap(OneofOptions* other) { if (other == this) return; InternalSwap(other); } -void EnumOptions::InternalSwap(EnumOptions* other) { - std::swap(allow_alias_, other->allow_alias_); - std::swap(deprecated_, other->deprecated_); +void OneofOptions::InternalSwap(OneofOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -10971,92 +10985,41 @@ void EnumOptions::InternalSwap(EnumOptions* other) { _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata EnumOptions::GetMetadata() const { +::google::protobuf::Metadata OneofOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumOptions_descriptor_; - metadata.reflection = EnumOptions_reflection_; - return metadata; + return file_level_metadata[14]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// EnumOptions +// OneofOptions -// optional bool allow_alias = 2; -bool EnumOptions::has_allow_alias() const { - return (_has_bits_[0] & 0x00000001u) != 0; +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int OneofOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); } -void EnumOptions::set_has_allow_alias() { - _has_bits_[0] |= 0x00000001u; +void OneofOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); } -void EnumOptions::clear_has_allow_alias() { - _has_bits_[0] &= ~0x00000001u; +const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Get(index); } -void EnumOptions::clear_allow_alias() { - allow_alias_ = false; - clear_has_allow_alias(); +::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Mutable(index); } - bool EnumOptions::allow_alias() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias) - return allow_alias_; +::google::protobuf::UninterpretedOption* OneofOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Add(); } - void EnumOptions::set_allow_alias(bool value) { - set_has_allow_alias(); - allow_alias_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias) -} - -// optional bool deprecated = 3 [default = false]; -bool EnumOptions::has_deprecated() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void EnumOptions::set_has_deprecated() { - _has_bits_[0] |= 0x00000002u; -} -void EnumOptions::clear_has_deprecated() { - _has_bits_[0] &= ~0x00000002u; -} -void EnumOptions::clear_deprecated() { - deprecated_ = false; - clear_has_deprecated(); -} - bool EnumOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated) - return deprecated_; -} - void EnumOptions::set_deprecated(bool value) { - set_has_deprecated(); - deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated) -} - -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int EnumOptions::uninterpreted_option_size() const { - return uninterpreted_option_.size(); -} -void EnumOptions::clear_uninterpreted_option() { - uninterpreted_option_.Clear(); -} -const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Get(index); -} -::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Mutable(index); -} -::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Add(); -} -::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -EnumOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option) - return &uninterpreted_option_; +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* +OneofOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option) + return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -EnumOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option) +OneofOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.OneofOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11065,117 +11028,128 @@ EnumOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EnumValueOptions::kDeprecatedFieldNumber; -const int EnumValueOptions::kUninterpretedOptionFieldNumber; +const int EnumOptions::kAllowAliasFieldNumber; +const int EnumOptions::kDeprecatedFieldNumber; +const int EnumOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EnumValueOptions::EnumValueOptions() +EnumOptions::EnumOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions) -} - -void EnumValueOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions) } - -EnumValueOptions::EnumValueOptions(const EnumValueOptions& from) +EnumOptions::EnumOptions(const EnumOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&allow_alias_, &from.allow_alias_, + reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions) } -void EnumValueOptions::SharedCtor() { +void EnumOptions::SharedCtor() { _cached_size_ = 0; - deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&allow_alias_, 0, reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); } -EnumValueOptions::~EnumValueOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions) +EnumOptions::~EnumOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions) SharedDtor(); } -void EnumValueOptions::SharedDtor() { - if (this != default_instance_) { - } +void EnumOptions::SharedDtor() { } -void EnumValueOptions::SetCachedSize(int size) const { +void EnumOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() { +const ::google::protobuf::Descriptor* EnumOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumValueOptions_descriptor_; + return file_level_metadata[15].descriptor; } -const EnumValueOptions& EnumValueOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const EnumOptions& EnumOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumValueOptions* EnumValueOptions::default_instance_ = NULL; - -EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const { - EnumValueOptions* n = new EnumValueOptions; +EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const { + EnumOptions* n = new EnumOptions; if (arena != NULL) { arena->Own(n); } return n; } -void EnumValueOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) +void EnumOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&allow_alias_, 0, reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool EnumValueOptions::MergePartialFromCodedStream( +bool EnumOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool deprecated = 1 [default = false]; - case 1: { - if (tag == 8) { + // optional bool allow_alias = 2; + case 2: { + if (tag == 16u) { + set_has_allow_alias(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &deprecated_))); + input, &allow_alias_))); + } else { + goto handle_unusual; + } + break; + } + + // optional bool deprecated = 3 [default = false]; + case 3: { + if (tag == 24u) { set_has_deprecated(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &deprecated_))); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11187,7 +11161,7 @@ bool EnumValueOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11198,20 +11172,25 @@ bool EnumValueOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions) return false; #undef DO_ } -void EnumValueOptions::SerializeWithCachedSizes( +void EnumOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions) - // optional bool deprecated = 1 [default = false]; + // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions) + // optional bool allow_alias = 2; + if (has_allow_alias()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output); + } + + // optional bool deprecated = 3 [default = false]; if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; @@ -11228,52 +11207,45 @@ void EnumValueOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions) } -::google::protobuf::uint8* EnumValueOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions) - // optional bool deprecated = 1 [default = false]; +::google::protobuf::uint8* EnumOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions) + // optional bool allow_alias = 2; + if (has_allow_alias()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target); + } + + // optional bool deprecated = 3 [default = false]; if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions) return target; } -int EnumValueOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions) - int total_size = 0; - - // optional bool deprecated = 1 [default = false]; - if (has_deprecated()) { - total_size += 1 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t EnumOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11282,138 +11254,187 @@ int EnumValueOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + if (_has_bits_[0 / 32] & 3u) { + // optional bool allow_alias = 2; + if (has_allow_alias()) { + total_size += 1 + 1; + } + + // optional bool deprecated = 3 [default = false]; + if (has_deprecated()) { + total_size += 1 + 1; + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumValueOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions) + GOOGLE_DCHECK_NE(&from, this); + const EnumOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions) MergeFrom(*source); } } -void EnumValueOptions::MergeFrom(const EnumValueOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); +void EnumOptions::MergeFrom(const EnumOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions) + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_allow_alias()) { + set_allow_alias(from.allow_alias()); + } if (from.has_deprecated()) { set_deprecated(from.deprecated()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions) +void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void EnumValueOptions::CopyFrom(const EnumValueOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions) +void EnumOptions::CopyFrom(const EnumOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool EnumValueOptions::IsInitialized() const { +bool EnumOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void EnumValueOptions::Swap(EnumValueOptions* other) { +void EnumOptions::Swap(EnumOptions* other) { if (other == this) return; InternalSwap(other); } -void EnumValueOptions::InternalSwap(EnumValueOptions* other) { - std::swap(deprecated_, other->deprecated_); +void EnumOptions::InternalSwap(EnumOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(allow_alias_, other->allow_alias_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata EnumValueOptions::GetMetadata() const { +::google::protobuf::Metadata EnumOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumValueOptions_descriptor_; - metadata.reflection = EnumValueOptions_reflection_; - return metadata; + return file_level_metadata[15]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// EnumValueOptions +// EnumOptions -// optional bool deprecated = 1 [default = false]; -bool EnumValueOptions::has_deprecated() const { +// optional bool allow_alias = 2; +bool EnumOptions::has_allow_alias() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void EnumValueOptions::set_has_deprecated() { +void EnumOptions::set_has_allow_alias() { _has_bits_[0] |= 0x00000001u; } -void EnumValueOptions::clear_has_deprecated() { +void EnumOptions::clear_has_allow_alias() { _has_bits_[0] &= ~0x00000001u; } -void EnumValueOptions::clear_deprecated() { - deprecated_ = false; - clear_has_deprecated(); +void EnumOptions::clear_allow_alias() { + allow_alias_ = false; + clear_has_allow_alias(); } - bool EnumValueOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated) - return deprecated_; +bool EnumOptions::allow_alias() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias) + return allow_alias_; } - void EnumValueOptions::set_deprecated(bool value) { - set_has_deprecated(); - deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated) +void EnumOptions::set_allow_alias(bool value) { + set_has_allow_alias(); + allow_alias_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias) } -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int EnumValueOptions::uninterpreted_option_size() const { - return uninterpreted_option_.size(); +// optional bool deprecated = 3 [default = false]; +bool EnumOptions::has_deprecated() const { + return (_has_bits_[0] & 0x00000002u) != 0; } -void EnumValueOptions::clear_uninterpreted_option() { - uninterpreted_option_.Clear(); +void EnumOptions::set_has_deprecated() { + _has_bits_[0] |= 0x00000002u; } -const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option) +void EnumOptions::clear_has_deprecated() { + _has_bits_[0] &= ~0x00000002u; +} +void EnumOptions::clear_deprecated() { + deprecated_ = false; + clear_has_deprecated(); +} +bool EnumOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated) + return deprecated_; +} +void EnumOptions::set_deprecated(bool value) { + set_has_deprecated(); + deprecated_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated) +} + +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int EnumOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); +} +void EnumOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); +} +const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -EnumValueOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option) +EnumOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -EnumValueOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option) +EnumOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11422,117 +11443,108 @@ EnumValueOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ServiceOptions::kDeprecatedFieldNumber; -const int ServiceOptions::kUninterpretedOptionFieldNumber; +const int EnumValueOptions::kDeprecatedFieldNumber; +const int EnumValueOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -ServiceOptions::ServiceOptions() +EnumValueOptions::EnumValueOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions) -} - -void ServiceOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions) } - -ServiceOptions::ServiceOptions(const ServiceOptions& from) +EnumValueOptions::EnumValueOptions(const EnumValueOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + deprecated_ = from.deprecated_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions) } -void ServiceOptions::SharedCtor() { +void EnumValueOptions::SharedCtor() { _cached_size_ = 0; deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -ServiceOptions::~ServiceOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions) +EnumValueOptions::~EnumValueOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions) SharedDtor(); } -void ServiceOptions::SharedDtor() { - if (this != default_instance_) { - } +void EnumValueOptions::SharedDtor() { } -void ServiceOptions::SetCachedSize(int size) const { +void EnumValueOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* ServiceOptions::descriptor() { +const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return ServiceOptions_descriptor_; + return file_level_metadata[16].descriptor; } -const ServiceOptions& ServiceOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const EnumValueOptions& EnumValueOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -ServiceOptions* ServiceOptions::default_instance_ = NULL; - -ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const { - ServiceOptions* n = new ServiceOptions; +EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const { + EnumValueOptions* n = new EnumValueOptions; if (arena != NULL) { arena->Own(n); } return n; } -void ServiceOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) +void EnumValueOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + deprecated_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool ServiceOptions::MergePartialFromCodedStream( +bool EnumValueOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool deprecated = 33 [default = false]; - case 33: { - if (tag == 264) { + // optional bool deprecated = 1 [default = false]; + case 1: { + if (tag == 8u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11544,7 +11556,7 @@ bool ServiceOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11555,20 +11567,20 @@ bool ServiceOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions) return false; #undef DO_ } -void ServiceOptions::SerializeWithCachedSizes( +void EnumValueOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions) - // optional bool deprecated = 33 [default = false]; + // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions) + // optional bool deprecated = 1 [default = false]; if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; @@ -11585,52 +11597,40 @@ void ServiceOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions) } -::google::protobuf::uint8* ServiceOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions) - // optional bool deprecated = 33 [default = false]; +::google::protobuf::uint8* EnumValueOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions) + // optional bool deprecated = 1 [default = false]; if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions) return target; } -int ServiceOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions) - int total_size = 0; - - // optional bool deprecated = 33 [default = false]; - if (has_deprecated()) { - total_size += 2 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t EnumValueOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11639,138 +11639,150 @@ int ServiceOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + // optional bool deprecated = 1 [default = false]; + if (has_deprecated()) { + total_size += 1 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const ServiceOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions) + GOOGLE_DCHECK_NE(&from, this); + const EnumValueOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions) MergeFrom(*source); } } -void ServiceOptions::MergeFrom(const ServiceOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void EnumValueOptions::MergeFrom(const EnumValueOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } } -void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions) +void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void ServiceOptions::CopyFrom(const ServiceOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions) +void EnumValueOptions::CopyFrom(const EnumValueOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool ServiceOptions::IsInitialized() const { +bool EnumValueOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void ServiceOptions::Swap(ServiceOptions* other) { +void EnumValueOptions::Swap(EnumValueOptions* other) { if (other == this) return; InternalSwap(other); } -void ServiceOptions::InternalSwap(ServiceOptions* other) { - std::swap(deprecated_, other->deprecated_); +void EnumValueOptions::InternalSwap(EnumValueOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata ServiceOptions::GetMetadata() const { +::google::protobuf::Metadata EnumValueOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = ServiceOptions_descriptor_; - metadata.reflection = ServiceOptions_reflection_; - return metadata; + return file_level_metadata[16]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// ServiceOptions +// EnumValueOptions -// optional bool deprecated = 33 [default = false]; -bool ServiceOptions::has_deprecated() const { +// optional bool deprecated = 1 [default = false]; +bool EnumValueOptions::has_deprecated() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void ServiceOptions::set_has_deprecated() { +void EnumValueOptions::set_has_deprecated() { _has_bits_[0] |= 0x00000001u; } -void ServiceOptions::clear_has_deprecated() { +void EnumValueOptions::clear_has_deprecated() { _has_bits_[0] &= ~0x00000001u; } -void ServiceOptions::clear_deprecated() { +void EnumValueOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool ServiceOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated) +bool EnumValueOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated) return deprecated_; } - void ServiceOptions::set_deprecated(bool value) { +void EnumValueOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated) + // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated) } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int ServiceOptions::uninterpreted_option_size() const { +int EnumValueOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); } -void ServiceOptions::clear_uninterpreted_option() { +void EnumValueOptions::clear_uninterpreted_option() { uninterpreted_option_.Clear(); } -const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option) +const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -ServiceOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option) +EnumValueOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -ServiceOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option) +EnumValueOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11779,117 +11791,108 @@ ServiceOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int MethodOptions::kDeprecatedFieldNumber; -const int MethodOptions::kUninterpretedOptionFieldNumber; +const int ServiceOptions::kDeprecatedFieldNumber; +const int ServiceOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -MethodOptions::MethodOptions() +ServiceOptions::ServiceOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions) -} - -void MethodOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions) } - -MethodOptions::MethodOptions(const MethodOptions& from) +ServiceOptions::ServiceOptions(const ServiceOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + deprecated_ = from.deprecated_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions) } -void MethodOptions::SharedCtor() { +void ServiceOptions::SharedCtor() { _cached_size_ = 0; deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -MethodOptions::~MethodOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions) +ServiceOptions::~ServiceOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions) SharedDtor(); } -void MethodOptions::SharedDtor() { - if (this != default_instance_) { - } +void ServiceOptions::SharedDtor() { } -void MethodOptions::SetCachedSize(int size) const { +void ServiceOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* MethodOptions::descriptor() { +const ::google::protobuf::Descriptor* ServiceOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return MethodOptions_descriptor_; + return file_level_metadata[17].descriptor; } -const MethodOptions& MethodOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const ServiceOptions& ServiceOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MethodOptions* MethodOptions::default_instance_ = NULL; - -MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const { - MethodOptions* n = new MethodOptions; +ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const { + ServiceOptions* n = new ServiceOptions; if (arena != NULL) { arena->Own(n); } return n; } -void MethodOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) +void ServiceOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + deprecated_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool MethodOptions::MergePartialFromCodedStream( +bool ServiceOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional bool deprecated = 33 [default = false]; case 33: { - if (tag == 264) { + if (tag == 264u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11901,7 +11904,7 @@ bool MethodOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11912,17 +11915,17 @@ bool MethodOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions) return false; #undef DO_ } -void MethodOptions::SerializeWithCachedSizes( +void ServiceOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions) // optional bool deprecated = 33 [default = false]; if (has_deprecated()) { ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); @@ -11942,12 +11945,13 @@ void MethodOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions) } -::google::protobuf::uint8* MethodOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions) +::google::protobuf::uint8* ServiceOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions) // optional bool deprecated = 33 [default = false]; if (has_deprecated()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); @@ -11956,38 +11960,25 @@ ::google::protobuf::uint8* MethodOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions) return target; } -int MethodOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions) - int total_size = 0; - - // optional bool deprecated = 33 [default = false]; - if (has_deprecated()) { - total_size += 2 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t ServiceOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11996,138 +11987,150 @@ int MethodOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + total_size += 2 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MethodOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions) + GOOGLE_DCHECK_NE(&from, this); + const ServiceOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions) MergeFrom(*source); } } -void MethodOptions::MergeFrom(const MethodOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void ServiceOptions::MergeFrom(const ServiceOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } } -void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions) +void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void MethodOptions::CopyFrom(const MethodOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions) +void ServiceOptions::CopyFrom(const ServiceOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool MethodOptions::IsInitialized() const { +bool ServiceOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void MethodOptions::Swap(MethodOptions* other) { +void ServiceOptions::Swap(ServiceOptions* other) { if (other == this) return; InternalSwap(other); } -void MethodOptions::InternalSwap(MethodOptions* other) { - std::swap(deprecated_, other->deprecated_); +void ServiceOptions::InternalSwap(ServiceOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata MethodOptions::GetMetadata() const { +::google::protobuf::Metadata ServiceOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MethodOptions_descriptor_; - metadata.reflection = MethodOptions_reflection_; - return metadata; + return file_level_metadata[17]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// MethodOptions +// ServiceOptions // optional bool deprecated = 33 [default = false]; -bool MethodOptions::has_deprecated() const { +bool ServiceOptions::has_deprecated() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void MethodOptions::set_has_deprecated() { +void ServiceOptions::set_has_deprecated() { _has_bits_[0] |= 0x00000001u; } -void MethodOptions::clear_has_deprecated() { +void ServiceOptions::clear_has_deprecated() { _has_bits_[0] &= ~0x00000001u; } -void MethodOptions::clear_deprecated() { +void ServiceOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool MethodOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated) +bool ServiceOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated) return deprecated_; } - void MethodOptions::set_deprecated(bool value) { +void ServiceOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated) + // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated) } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int MethodOptions::uninterpreted_option_size() const { +int ServiceOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); } -void MethodOptions::clear_uninterpreted_option() { +void ServiceOptions::clear_uninterpreted_option() { uninterpreted_option_.Clear(); } -const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option) +const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -MethodOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option) +ServiceOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -MethodOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option) +ServiceOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_; } @@ -12136,123 +12139,133 @@ MethodOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int UninterpretedOption_NamePart::kNamePartFieldNumber; -const int UninterpretedOption_NamePart::kIsExtensionFieldNumber; +const int MethodOptions::kDeprecatedFieldNumber; +const int MethodOptions::kIdempotencyLevelFieldNumber; +const int MethodOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -UninterpretedOption_NamePart::UninterpretedOption_NamePart() +MethodOptions::MethodOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart) -} - -void UninterpretedOption_NamePart::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions) } - -UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from) +MethodOptions::MethodOptions(const MethodOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&deprecated_, &from.deprecated_, + reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions) } -void UninterpretedOption_NamePart::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); +void MethodOptions::SharedCtor() { _cached_size_ = 0; - name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - is_extension_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&deprecated_, 0, reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); } -UninterpretedOption_NamePart::~UninterpretedOption_NamePart() { - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart) +MethodOptions::~MethodOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions) SharedDtor(); } -void UninterpretedOption_NamePart::SharedDtor() { - name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } +void MethodOptions::SharedDtor() { } -void UninterpretedOption_NamePart::SetCachedSize(int size) const { +void MethodOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() { +const ::google::protobuf::Descriptor* MethodOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return UninterpretedOption_NamePart_descriptor_; + return file_level_metadata[18].descriptor; } -const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const MethodOptions& MethodOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -UninterpretedOption_NamePart* UninterpretedOption_NamePart::default_instance_ = NULL; - -UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const { - UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart; +MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const { + MethodOptions* n = new MethodOptions; if (arena != NULL) { arena->Own(n); } return n; } -void UninterpretedOption_NamePart::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) + _extensions_.Clear(); + uninterpreted_option_.Clear(); if (_has_bits_[0 / 32] & 3u) { - if (has_name_part()) { - name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - is_extension_ = false; - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + ::memset(&deprecated_, 0, reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool UninterpretedOption_NamePart::MergePartialFromCodedStream( +bool MethodOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required string name_part = 1; - case 1: { - if (tag == 10) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name_part())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); + // optional bool deprecated = 33 [default = false]; + case 33: { + if (tag == 264u) { + set_has_deprecated(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &deprecated_))); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_is_extension; break; } - // required bool is_extension = 2; - case 2: { - if (tag == 16) { - parse_is_extension: + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + case 34: { + if (tag == 272u) { + int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &is_extension_))); - set_has_is_extension(); + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + if (::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value)) { + set_idempotency_level(static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(value)); + } else { + mutable_unknown_fields()->AddVarint(34, value); + } + } else { + goto handle_unusual; + } + break; + } + + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + case 999: { + if (tag == 7994u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; + input->UnsafeDecrementRecursionDepth(); break; } @@ -12263,6 +12276,11 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { goto success; } + if ((8000u <= tag)) { + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), + mutable_unknown_fields())); + continue; + } DO_(::google::protobuf::internal::WireFormat::SkipField( input, tag, mutable_unknown_fields())); break; @@ -12270,419 +12288,391 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions) return false; #undef DO_ } -void UninterpretedOption_NamePart::SerializeWithCachedSizes( +void MethodOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart) - // required string name_part = 1; - if (has_name_part()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name_part(), output); + // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions) + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); } - // required bool is_extension = 2; - if (has_is_extension()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output); + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 34, this->idempotency_level(), output); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 999, this->uninterpreted_option(i), output); + } + + // Extension range [1000, 536870912) + _extensions_.SerializeWithCachedSizes( + 1000, 536870912, output); + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions) } -::google::protobuf::uint8* UninterpretedOption_NamePart::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart) - // required string name_part = 1; - if (has_name_part()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->name_part(), target); +::google::protobuf::uint8* MethodOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions) + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); } - // required bool is_extension = 2; - if (has_is_extension()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target); + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 34, this->idempotency_level(), target); + } + + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } + // Extension range [1000, 536870912) + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions) return target; } -int UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const { -// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart) - int total_size = 0; - - if (has_name_part()) { - // required string name_part = 1; - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name_part()); - } - - if (has_is_extension()) { - // required bool is_extension = 2; - total_size += 1 + 1; - } - - return total_size; -} -int UninterpretedOption_NamePart::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart) - int total_size = 0; - - if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present. - // required string name_part = 1; - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name_part()); +size_t MethodOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions) + size_t total_size = 0; - // required bool is_extension = 2; - total_size += 1 + 1; + total_size += _extensions_.ByteSize(); - } else { - total_size += RequiredFieldsByteSizeFallback(); - } if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + if (_has_bits_[0 / 32] & 3u) { + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + total_size += 2 + 1; + } + + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->idempotency_level()); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption.NamePart) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const UninterpretedOption_NamePart* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions) + GOOGLE_DCHECK_NE(&from, this); + const MethodOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions) MergeFrom(*source); } } -void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_name_part()) { - set_has_name_part(); - name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); +void MethodOptions::MergeFrom(const MethodOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions) + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } - if (from.has_is_extension()) { - set_is_extension(from.is_extension()); + if (from.has_idempotency_level()) { + set_idempotency_level(from.idempotency_level()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::CopyFrom(const MethodOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool UninterpretedOption_NamePart::IsInitialized() const { - if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; +bool MethodOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } + if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; return true; } -void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) { +void MethodOptions::Swap(MethodOptions* other) { if (other == this) return; InternalSwap(other); } -void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) { - name_part_.Swap(&other->name_part_); - std::swap(is_extension_, other->is_extension_); +void MethodOptions::InternalSwap(MethodOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); + std::swap(idempotency_level_, other->idempotency_level_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); + _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const { +::google::protobuf::Metadata MethodOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = UninterpretedOption_NamePart_descriptor_; - metadata.reflection = UninterpretedOption_NamePart_reflection_; - return metadata; + return file_level_metadata[18]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// MethodOptions + +// optional bool deprecated = 33 [default = false]; +bool MethodOptions::has_deprecated() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void MethodOptions::set_has_deprecated() { + _has_bits_[0] |= 0x00000001u; +} +void MethodOptions::clear_has_deprecated() { + _has_bits_[0] &= ~0x00000001u; +} +void MethodOptions::clear_deprecated() { + deprecated_ = false; + clear_has_deprecated(); +} +bool MethodOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated) + return deprecated_; +} +void MethodOptions::set_deprecated(bool value) { + set_has_deprecated(); + deprecated_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated) +} + +// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; +bool MethodOptions::has_idempotency_level() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void MethodOptions::set_has_idempotency_level() { + _has_bits_[0] |= 0x00000002u; +} +void MethodOptions::clear_has_idempotency_level() { + _has_bits_[0] &= ~0x00000002u; +} +void MethodOptions::clear_idempotency_level() { + idempotency_level_ = 0; + clear_has_idempotency_level(); +} +::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.idempotency_level) + return static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(idempotency_level_); +} +void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) { + assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value)); + set_has_idempotency_level(); + idempotency_level_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level) +} + +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int MethodOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); +} +void MethodOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); +} +const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Get(index); +} +::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Mutable(index); +} +::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Add(); +} +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* +MethodOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option) + return &uninterpreted_option_; +} +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& +MethodOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_; } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int UninterpretedOption::kNameFieldNumber; -const int UninterpretedOption::kIdentifierValueFieldNumber; -const int UninterpretedOption::kPositiveIntValueFieldNumber; -const int UninterpretedOption::kNegativeIntValueFieldNumber; -const int UninterpretedOption::kDoubleValueFieldNumber; -const int UninterpretedOption::kStringValueFieldNumber; -const int UninterpretedOption::kAggregateValueFieldNumber; +const int UninterpretedOption_NamePart::kNamePartFieldNumber; +const int UninterpretedOption_NamePart::kIsExtensionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -UninterpretedOption::UninterpretedOption() +UninterpretedOption_NamePart::UninterpretedOption_NamePart() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption) -} - -void UninterpretedOption::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart) } - -UninterpretedOption::UninterpretedOption(const UninterpretedOption& from) +UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name_part()) { + name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); + } + is_extension_ = from.is_extension_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart) } -void UninterpretedOption::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); +void UninterpretedOption_NamePart::SharedCtor() { _cached_size_ = 0; - identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - positive_int_value_ = GOOGLE_ULONGLONG(0); - negative_int_value_ = GOOGLE_LONGLONG(0); - double_value_ = 0; - string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + is_extension_ = false; } -UninterpretedOption::~UninterpretedOption() { - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption) +UninterpretedOption_NamePart::~UninterpretedOption_NamePart() { + // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart) SharedDtor(); } -void UninterpretedOption::SharedDtor() { - identifier_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - aggregate_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } +void UninterpretedOption_NamePart::SharedDtor() { + name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -void UninterpretedOption::SetCachedSize(int size) const { +void UninterpretedOption_NamePart::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* UninterpretedOption::descriptor() { +const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() { protobuf_AssignDescriptorsOnce(); - return UninterpretedOption_descriptor_; + return file_level_metadata[19].descriptor; } -const UninterpretedOption& UninterpretedOption::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -UninterpretedOption* UninterpretedOption::default_instance_ = NULL; - -UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const { - UninterpretedOption* n = new UninterpretedOption; +UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const { + UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart; if (arena != NULL) { arena->Own(n); } return n; } -void UninterpretedOption::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(UninterpretedOption, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 126u) { - ZR_(positive_int_value_, double_value_); - if (has_identifier_value()) { - identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_string_value()) { - string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_aggregate_value()) { - aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - -#undef ZR_HELPER_ -#undef ZR_ - - name_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); +void UninterpretedOption_NamePart::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) + if (has_name_part()) { + GOOGLE_DCHECK(!name_part_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_part_.UnsafeRawStringPointer())->clear(); } + is_extension_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool UninterpretedOption::MergePartialFromCodedStream( +bool UninterpretedOption_NamePart::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - case 2: { - if (tag == 18) { - DO_(input->IncrementRecursionDepth()); - parse_loop_name: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( - input, add_name())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_loop_name; - input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_identifier_value; - break; - } - - // optional string identifier_value = 3; - case 3: { - if (tag == 26) { - parse_identifier_value: + // required string name_part = 1; + case 1: { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_identifier_value())); + input, this->mutable_name_part())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.identifier_value"); - } else { - goto handle_unusual; - } - if (input->ExpectTag(32)) goto parse_positive_int_value; - break; - } - - // optional uint64 positive_int_value = 4; - case 4: { - if (tag == 32) { - parse_positive_int_value: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &positive_int_value_))); - set_has_positive_int_value(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(40)) goto parse_negative_int_value; - break; - } - - // optional int64 negative_int_value = 5; - case 5: { - if (tag == 40) { - parse_negative_int_value: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &negative_int_value_))); - set_has_negative_int_value(); + "google.protobuf.UninterpretedOption.NamePart.name_part"); } else { goto handle_unusual; } - if (input->ExpectTag(49)) goto parse_double_value; break; } - // optional double double_value = 6; - case 6: { - if (tag == 49) { - parse_double_value: + // required bool is_extension = 2; + case 2: { + if (tag == 16u) { + set_has_is_extension(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &double_value_))); - set_has_double_value(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(58)) goto parse_string_value; - break; - } - - // optional bytes string_value = 7; - case 7: { - if (tag == 58) { - parse_string_value: - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( - input, this->mutable_string_value())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(66)) goto parse_aggregate_value; - break; - } - - // optional string aggregate_value = 8; - case 8: { - if (tag == 66) { - parse_aggregate_value: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_aggregate_value())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.aggregate_value"); + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &is_extension_))); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -12700,288 +12690,177 @@ bool UninterpretedOption::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart) return false; #undef DO_ } -void UninterpretedOption::SerializeWithCachedSizes( +void UninterpretedOption_NamePart::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption) - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - for (unsigned int i = 0, n = this->name_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->name(i), output); - } - - // optional string identifier_value = 3; - if (has_identifier_value()) { + // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart) + // required string name_part = 1; + if (has_name_part()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.identifier_value"); + "google.protobuf.UninterpretedOption.NamePart.name_part"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->identifier_value(), output); - } - - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->positive_int_value(), output); - } - - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->negative_int_value(), output); - } - - // optional double double_value = 6; - if (has_double_value()) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->double_value(), output); - } - - // optional bytes string_value = 7; - if (has_string_value()) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( - 7, this->string_value(), output); + 1, this->name_part(), output); } - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.aggregate_value"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 8, this->aggregate_value(), output); + // required bool is_extension = 2; + if (has_is_extension()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart) } -::google::protobuf::uint8* UninterpretedOption::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption) - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - for (unsigned int i = 0, n = this->name_size(); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->name(i), target); - } - - // optional string identifier_value = 3; - if (has_identifier_value()) { +::google::protobuf::uint8* UninterpretedOption_NamePart::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart) + // required string name_part = 1; + if (has_name_part()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.identifier_value"); + "google.protobuf.UninterpretedOption.NamePart.name_part"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->identifier_value(), target); + 1, this->name_part(), target); } - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->positive_int_value(), target); + // required bool is_extension = 2; + if (has_is_extension()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target); } - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->negative_int_value(), target); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); } + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart) + return target; +} - // optional double double_value = 6; - if (has_double_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->double_value(), target); - } +size_t UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const { +// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart) + size_t total_size = 0; - // optional bytes string_value = 7; - if (has_string_value()) { - target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( - 7, this->string_value(), target); + if (has_name_part()) { + // required string name_part = 1; + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name_part()); } - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.aggregate_value"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 8, this->aggregate_value(), target); + if (has_is_extension()) { + // required bool is_extension = 2; + total_size += 1 + 1; } + return total_size; +} +size_t UninterpretedOption_NamePart::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart) + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption) - return target; -} + if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present. + // required string name_part = 1; + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name_part()); -int UninterpretedOption::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption) - int total_size = 0; + // required bool is_extension = 2; + total_size += 1 + 1; - if (_has_bits_[1 / 32] & 126u) { - // optional string identifier_value = 3; - if (has_identifier_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->identifier_value()); - } + } else { + total_size += RequiredFieldsByteSizeFallback(); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->positive_int_value()); - } - - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->negative_int_value()); - } - - // optional double double_value = 6; - if (has_double_value()) { - total_size += 1 + 8; - } - - // optional bytes string_value = 7; - if (has_string_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( - this->string_value()); - } - - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->aggregate_value()); - } - - } - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - total_size += 1 * this->name_size(); - for (int i = 0; i < this->name_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->name(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const UninterpretedOption* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption.NamePart) + GOOGLE_DCHECK_NE(&from, this); + const UninterpretedOption_NamePart* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption.NamePart) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption.NamePart) MergeFrom(*source); } } -void UninterpretedOption::MergeFrom(const UninterpretedOption& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - name_.MergeFrom(from.name_); - if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { - if (from.has_identifier_value()) { - set_has_identifier_value(); - identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); - } - if (from.has_positive_int_value()) { - set_positive_int_value(from.positive_int_value()); - } - if (from.has_negative_int_value()) { - set_negative_int_value(from.negative_int_value()); - } - if (from.has_double_value()) { - set_double_value(from.double_value()); - } - if (from.has_string_value()) { - set_has_string_value(); - string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); +void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_name_part()) { + set_has_name_part(); + name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); } - if (from.has_aggregate_value()) { - set_has_aggregate_value(); - aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + if (from.has_is_extension()) { + set_is_extension(from.is_extension()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void UninterpretedOption::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption) +void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart) if (&from == this) return; Clear(); MergeFrom(from); } -void UninterpretedOption::CopyFrom(const UninterpretedOption& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption) +void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart) if (&from == this) return; Clear(); MergeFrom(from); } -bool UninterpretedOption::IsInitialized() const { - - if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false; +bool UninterpretedOption_NamePart::IsInitialized() const { + if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; return true; } -void UninterpretedOption::Swap(UninterpretedOption* other) { +void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) { if (other == this) return; InternalSwap(other); } -void UninterpretedOption::InternalSwap(UninterpretedOption* other) { - name_.UnsafeArenaSwap(&other->name_); - identifier_value_.Swap(&other->identifier_value_); - std::swap(positive_int_value_, other->positive_int_value_); - std::swap(negative_int_value_, other->negative_int_value_); - std::swap(double_value_, other->double_value_); - string_value_.Swap(&other->string_value_); - aggregate_value_.Swap(&other->aggregate_value_); +void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) { + name_part_.Swap(&other->name_part_); + std::swap(is_extension_, other->is_extension_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); } -::google::protobuf::Metadata UninterpretedOption::GetMetadata() const { +::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = UninterpretedOption_descriptor_; - metadata.reflection = UninterpretedOption_reflection_; - return metadata; + return file_level_metadata[19]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -13001,37 +12880,45 @@ void UninterpretedOption_NamePart::clear_name_part() { name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name_part(); } - const ::std::string& UninterpretedOption_NamePart::name_part() const { +const ::std::string& UninterpretedOption_NamePart::name_part() const { // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part) - return name_part_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_part_.GetNoArena(); } - void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) { +void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part) } - void UninterpretedOption_NamePart::set_name_part(const char* value) { +#if LANG_CXX11 +void UninterpretedOption_NamePart::set_name_part(::std::string&& value) { + set_has_name_part(); + name_part_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.NamePart.name_part) +} +#endif +void UninterpretedOption_NamePart::set_name_part(const char* value) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.NamePart.name_part) } - void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) { +void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.NamePart.name_part) } - ::std::string* UninterpretedOption_NamePart::mutable_name_part() { +::std::string* UninterpretedOption_NamePart::mutable_name_part() { set_has_name_part(); // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part) return name_part_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* UninterpretedOption_NamePart::release_name_part() { +::std::string* UninterpretedOption_NamePart::release_name_part() { // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part) clear_has_name_part(); return name_part_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) { +void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) { if (name_part != NULL) { set_has_name_part(); } else { @@ -13055,472 +12942,231 @@ void UninterpretedOption_NamePart::clear_is_extension() { is_extension_ = false; clear_has_is_extension(); } - bool UninterpretedOption_NamePart::is_extension() const { +bool UninterpretedOption_NamePart::is_extension() const { // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.is_extension) return is_extension_; } - void UninterpretedOption_NamePart::set_is_extension(bool value) { +void UninterpretedOption_NamePart::set_is_extension(bool value) { set_has_is_extension(); is_extension_ = value; // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension) } -// ------------------------------------------------------------------- +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// UninterpretedOption +// =================================================================== -// repeated .google.protobuf.UninterpretedOption.NamePart name = 2; -int UninterpretedOption::name_size() const { - return name_.size(); -} -void UninterpretedOption::clear_name() { - name_.Clear(); -} -const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name) - return name_.Get(index); -} -::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name) - return name_.Mutable(index); -} -::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() { - // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name) - return name_.Add(); -} -::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >* -UninterpretedOption::mutable_name() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name) - return &name_; -} -const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >& -UninterpretedOption::name() const { - // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name) - return name_; -} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int UninterpretedOption::kNameFieldNumber; +const int UninterpretedOption::kIdentifierValueFieldNumber; +const int UninterpretedOption::kPositiveIntValueFieldNumber; +const int UninterpretedOption::kNegativeIntValueFieldNumber; +const int UninterpretedOption::kDoubleValueFieldNumber; +const int UninterpretedOption::kStringValueFieldNumber; +const int UninterpretedOption::kAggregateValueFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -// optional string identifier_value = 3; -bool UninterpretedOption::has_identifier_value() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void UninterpretedOption::set_has_identifier_value() { - _has_bits_[0] |= 0x00000002u; -} -void UninterpretedOption::clear_has_identifier_value() { - _has_bits_[0] &= ~0x00000002u; +UninterpretedOption::UninterpretedOption() + : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } + SharedCtor(); + // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption) } -void UninterpretedOption::clear_identifier_value() { - identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_identifier_value(); +UninterpretedOption::UninterpretedOption(const UninterpretedOption& from) + : ::google::protobuf::Message(), + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + name_(from.name_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_identifier_value()) { + identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); + } + string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_string_value()) { + string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); + } + aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_aggregate_value()) { + aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + } + ::memcpy(&positive_int_value_, &from.positive_int_value_, + reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption) } - const ::std::string& UninterpretedOption::identifier_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value) - return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + +void UninterpretedOption::SharedCtor() { + _cached_size_ = 0; + identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(&positive_int_value_, 0, reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); } - void UninterpretedOption::set_identifier_value(const ::std::string& value) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value) + +UninterpretedOption::~UninterpretedOption() { + // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption) + SharedDtor(); } - void UninterpretedOption::set_identifier_value(const char* value) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value) + +void UninterpretedOption::SharedDtor() { + identifier_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + aggregate_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void UninterpretedOption::set_identifier_value(const char* value, size_t size) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value) + +void UninterpretedOption::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); } - ::std::string* UninterpretedOption::mutable_identifier_value() { - set_has_identifier_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value) - return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +const ::google::protobuf::Descriptor* UninterpretedOption::descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[20].descriptor; } - ::std::string* UninterpretedOption::release_identifier_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value) - clear_has_identifier_value(); - return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + +const UninterpretedOption& UninterpretedOption::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } - void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) { - if (identifier_value != NULL) { - set_has_identifier_value(); - } else { - clear_has_identifier_value(); + +UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const { + UninterpretedOption* n = new UninterpretedOption; + if (arena != NULL) { + arena->Own(n); } - identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value) + return n; } -// optional uint64 positive_int_value = 4; -bool UninterpretedOption::has_positive_int_value() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -void UninterpretedOption::set_has_positive_int_value() { - _has_bits_[0] |= 0x00000004u; -} -void UninterpretedOption::clear_has_positive_int_value() { - _has_bits_[0] &= ~0x00000004u; -} -void UninterpretedOption::clear_positive_int_value() { - positive_int_value_ = GOOGLE_ULONGLONG(0); - clear_has_positive_int_value(); -} - ::google::protobuf::uint64 UninterpretedOption::positive_int_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value) - return positive_int_value_; -} - void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) { - set_has_positive_int_value(); - positive_int_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value) -} - -// optional int64 negative_int_value = 5; -bool UninterpretedOption::has_negative_int_value() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -void UninterpretedOption::set_has_negative_int_value() { - _has_bits_[0] |= 0x00000008u; -} -void UninterpretedOption::clear_has_negative_int_value() { - _has_bits_[0] &= ~0x00000008u; -} -void UninterpretedOption::clear_negative_int_value() { - negative_int_value_ = GOOGLE_LONGLONG(0); - clear_has_negative_int_value(); -} - ::google::protobuf::int64 UninterpretedOption::negative_int_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value) - return negative_int_value_; -} - void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) { - set_has_negative_int_value(); - negative_int_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value) -} - -// optional double double_value = 6; -bool UninterpretedOption::has_double_value() const { - return (_has_bits_[0] & 0x00000010u) != 0; -} -void UninterpretedOption::set_has_double_value() { - _has_bits_[0] |= 0x00000010u; -} -void UninterpretedOption::clear_has_double_value() { - _has_bits_[0] &= ~0x00000010u; -} -void UninterpretedOption::clear_double_value() { - double_value_ = 0; - clear_has_double_value(); -} - double UninterpretedOption::double_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value) - return double_value_; -} - void UninterpretedOption::set_double_value(double value) { - set_has_double_value(); - double_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value) -} - -// optional bytes string_value = 7; -bool UninterpretedOption::has_string_value() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -void UninterpretedOption::set_has_string_value() { - _has_bits_[0] |= 0x00000020u; -} -void UninterpretedOption::clear_has_string_value() { - _has_bits_[0] &= ~0x00000020u; -} -void UninterpretedOption::clear_string_value() { - string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_string_value(); -} - const ::std::string& UninterpretedOption::string_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value) - return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_string_value(const ::std::string& value) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value) -} - void UninterpretedOption::set_string_value(const char* value) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value) -} - void UninterpretedOption::set_string_value(const void* value, size_t size) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value) -} - ::std::string* UninterpretedOption::mutable_string_value() { - set_has_string_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value) - return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* UninterpretedOption::release_string_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value) - clear_has_string_value(); - return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_allocated_string_value(::std::string* string_value) { - if (string_value != NULL) { - set_has_string_value(); - } else { - clear_has_string_value(); - } - string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value) -} - -// optional string aggregate_value = 8; -bool UninterpretedOption::has_aggregate_value() const { - return (_has_bits_[0] & 0x00000040u) != 0; -} -void UninterpretedOption::set_has_aggregate_value() { - _has_bits_[0] |= 0x00000040u; -} -void UninterpretedOption::clear_has_aggregate_value() { - _has_bits_[0] &= ~0x00000040u; -} -void UninterpretedOption::clear_aggregate_value() { - aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_aggregate_value(); -} - const ::std::string& UninterpretedOption::aggregate_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value) - return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_aggregate_value(const ::std::string& value) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value) -} - void UninterpretedOption::set_aggregate_value(const char* value) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.aggregate_value) -} - void UninterpretedOption::set_aggregate_value(const char* value, size_t size) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.aggregate_value) -} - ::std::string* UninterpretedOption::mutable_aggregate_value() { - set_has_aggregate_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value) - return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* UninterpretedOption::release_aggregate_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value) - clear_has_aggregate_value(); - return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) { - if (aggregate_value != NULL) { - set_has_aggregate_value(); - } else { - clear_has_aggregate_value(); - } - aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS - -// =================================================================== - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int SourceCodeInfo_Location::kPathFieldNumber; -const int SourceCodeInfo_Location::kSpanFieldNumber; -const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber; -const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber; -const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -SourceCodeInfo_Location::SourceCodeInfo_Location() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo.Location) -} - -void SourceCodeInfo_Location::InitAsDefaultInstance() { -} - -SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from) - : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location) -} - -void SourceCodeInfo_Location::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); - _cached_size_ = 0; - leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -SourceCodeInfo_Location::~SourceCodeInfo_Location() { - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location) - SharedDtor(); +void UninterpretedOption::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) + name_.Clear(); + if (_has_bits_[0 / 32] & 7u) { + if (has_identifier_value()) { + GOOGLE_DCHECK(!identifier_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*identifier_value_.UnsafeRawStringPointer())->clear(); + } + if (has_string_value()) { + GOOGLE_DCHECK(!string_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*string_value_.UnsafeRawStringPointer())->clear(); + } + if (has_aggregate_value()) { + GOOGLE_DCHECK(!aggregate_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*aggregate_value_.UnsafeRawStringPointer())->clear(); + } + } + if (_has_bits_[0 / 32] & 56u) { + ::memset(&positive_int_value_, 0, reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -void SourceCodeInfo_Location::SharedDtor() { - leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } -} - -void SourceCodeInfo_Location::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* SourceCodeInfo_Location::descriptor() { - protobuf_AssignDescriptorsOnce(); - return SourceCodeInfo_Location_descriptor_; -} - -const SourceCodeInfo_Location& SourceCodeInfo_Location::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; -} - -SourceCodeInfo_Location* SourceCodeInfo_Location::default_instance_ = NULL; - -SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena* arena) const { - SourceCodeInfo_Location* n = new SourceCodeInfo_Location; - if (arena != NULL) { - arena->Own(n); - } - return n; -} - -void SourceCodeInfo_Location::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) - if (_has_bits_[0 / 32] & 12u) { - if (has_leading_comments()) { - leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_trailing_comments()) { - trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - path_.Clear(); - span_.Clear(); - leading_detached_comments_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } -} - -bool SourceCodeInfo_Location::MergePartialFromCodedStream( +bool UninterpretedOption::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated int32 path = 1 [packed = true]; - case 1: { - if (tag == 10) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, this->mutable_path()))); - } else if (tag == 8) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 10, input, this->mutable_path()))); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_span; - break; - } - - // repeated int32 span = 2 [packed = true]; + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; case 2: { - if (tag == 18) { - parse_span: - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, this->mutable_span()))); - } else if (tag == 16) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 18, input, this->mutable_span()))); + if (tag == 18u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_name())); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_leading_comments; + input->UnsafeDecrementRecursionDepth(); break; } - // optional string leading_comments = 3; + // optional string identifier_value = 3; case 3: { - if (tag == 26) { - parse_leading_comments: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_leading_comments())); + input, this->mutable_identifier_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), + this->identifier_value().data(), this->identifier_value().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); + "google.protobuf.UninterpretedOption.identifier_value"); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_trailing_comments; break; } - // optional string trailing_comments = 4; + // optional uint64 positive_int_value = 4; case 4: { - if (tag == 34) { - parse_trailing_comments: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_trailing_comments())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + if (tag == 32u) { + set_has_positive_int_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &positive_int_value_))); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_leading_detached_comments; break; } - // repeated string leading_detached_comments = 6; + // optional int64 negative_int_value = 5; + case 5: { + if (tag == 40u) { + set_has_negative_int_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &negative_int_value_))); + } else { + goto handle_unusual; + } + break; + } + + // optional double double_value = 6; case 6: { - if (tag == 50) { - parse_leading_detached_comments: + if (tag == 49u) { + set_has_double_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( + input, &double_value_))); + } else { + goto handle_unusual; + } + break; + } + + // optional bytes string_value = 7; + case 7: { + if (tag == 58u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + input, this->mutable_string_value())); + } else { + goto handle_unusual; + } + break; + } + + // optional string aggregate_value = 8; + case 8: { + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_leading_detached_comments())); + input, this->mutable_aggregate_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(this->leading_detached_comments_size() - 1).data(), - this->leading_detached_comments(this->leading_detached_comments_size() - 1).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); + "google.protobuf.UninterpretedOption.aggregate_value"); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_leading_detached_comments; - if (input->ExpectAtEnd()) goto success; break; } @@ -13538,391 +13184,763 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption) return false; #undef DO_ } -void SourceCodeInfo_Location::SerializeWithCachedSizes( +void UninterpretedOption::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo.Location) - // repeated int32 path = 1 [packed = true]; - if (this->path_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_path_cached_byte_size_); + // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption) + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + for (unsigned int i = 0, n = this->name_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->name(i), output); } - for (int i = 0; i < this->path_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( - this->path(i), output); + + // optional string identifier_value = 3; + if (has_identifier_value()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->identifier_value().data(), this->identifier_value().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.UninterpretedOption.identifier_value"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->identifier_value(), output); } - // repeated int32 span = 2 [packed = true]; - if (this->span_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_span_cached_byte_size_); + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->positive_int_value(), output); } - for (int i = 0; i < this->span_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( - this->span(i), output); + + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->negative_int_value(), output); } - // optional string leading_comments = 3; - if (has_leading_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->leading_comments(), output); + // optional double double_value = 6; + if (has_double_value()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->double_value(), output); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 4, this->trailing_comments(), output); + // optional bytes string_value = 7; + if (has_string_value()) { + ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + 7, this->string_value(), output); } - // repeated string leading_detached_comments = 6; - for (int i = 0; i < this->leading_detached_comments_size(); i++) { + // optional string aggregate_value = 8; + if (has_aggregate_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); - ::google::protobuf::internal::WireFormatLite::WriteString( - 6, this->leading_detached_comments(i), output); + "google.protobuf.UninterpretedOption.aggregate_value"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 8, this->aggregate_value(), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption) } -::google::protobuf::uint8* SourceCodeInfo_Location::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location) - // repeated int32 path = 1 [packed = true]; - if (this->path_size() > 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( - 1, - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, - target); - target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( - _path_cached_byte_size_, target); - } - for (int i = 0; i < this->path_size(); i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32NoTagToArray(this->path(i), target); - } - - // repeated int32 span = 2 [packed = true]; - if (this->span_size() > 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( - 2, - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, - target); - target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( - _span_cached_byte_size_, target); - } - for (int i = 0; i < this->span_size(); i++) { +::google::protobuf::uint8* UninterpretedOption::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption) + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + for (unsigned int i = 0, n = this->name_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32NoTagToArray(this->span(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->name(i), false, target); } - // optional string leading_comments = 3; - if (has_leading_comments()) { + // optional string identifier_value = 3; + if (has_identifier_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), + this->identifier_value().data(), this->identifier_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); + "google.protobuf.UninterpretedOption.identifier_value"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->leading_comments(), target); + 3, this->identifier_value(), target); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->positive_int_value(), target); + } + + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->negative_int_value(), target); + } + + // optional double double_value = 6; + if (has_double_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->double_value(), target); + } + + // optional bytes string_value = 7; + if (has_string_value()) { target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 4, this->trailing_comments(), target); + ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + 7, this->string_value(), target); } - // repeated string leading_detached_comments = 6; - for (int i = 0; i < this->leading_detached_comments_size(); i++) { + // optional string aggregate_value = 8; + if (has_aggregate_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); - target = ::google::protobuf::internal::WireFormatLite:: - WriteStringToArray(6, this->leading_detached_comments(i), target); + "google.protobuf.UninterpretedOption.aggregate_value"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 8, this->aggregate_value(), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption) return target; } -int SourceCodeInfo_Location::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location) - int total_size = 0; +size_t UninterpretedOption::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption) + size_t total_size = 0; - if (_has_bits_[2 / 32] & 12u) { - // optional string leading_comments = 3; - if (has_leading_comments()) { + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + { + unsigned int count = this->name_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->name(i)); + } + } + + if (_has_bits_[0 / 32] & 63u) { + // optional string identifier_value = 3; + if (has_identifier_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->leading_comments()); + this->identifier_value()); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { + // optional bytes string_value = 7; + if (has_string_value()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->string_value()); + } + + // optional string aggregate_value = 8; + if (has_aggregate_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->trailing_comments()); + this->aggregate_value()); } - } - // repeated int32 path = 1 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->path_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->path(i)); - } - if (data_size > 0) { + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->positive_int_value()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _path_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; - } - // repeated int32 span = 2 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->span_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->span(i)); - } - if (data_size > 0) { + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->negative_int_value()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _span_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; - } - // repeated string leading_detached_comments = 6; - total_size += 1 * this->leading_detached_comments_size(); - for (int i = 0; i < this->leading_detached_comments_size(); i++) { - total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->leading_detached_comments(i)); - } + // optional double double_value = 6; + if (has_double_value()) { + total_size += 1 + 8; + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo.Location) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const SourceCodeInfo_Location* source = - ::google::protobuf::internal::DynamicCastToGenerated( - &from); - if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo.Location) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); +void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption) + GOOGLE_DCHECK_NE(&from, this); + const UninterpretedOption* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption) + MergeFrom(*source); + } +} + +void UninterpretedOption::MergeFrom(const UninterpretedOption& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.MergeFrom(from.name_); + if (from._has_bits_[0 / 32] & 63u) { + if (from.has_identifier_value()) { + set_has_identifier_value(); + identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); + } + if (from.has_string_value()) { + set_has_string_value(); + string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); + } + if (from.has_aggregate_value()) { + set_has_aggregate_value(); + aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + } + if (from.has_positive_int_value()) { + set_positive_int_value(from.positive_int_value()); + } + if (from.has_negative_int_value()) { + set_negative_int_value(from.negative_int_value()); + } + if (from.has_double_value()) { + set_double_value(from.double_value()); + } + } +} + +void UninterpretedOption::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void UninterpretedOption::CopyFrom(const UninterpretedOption& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool UninterpretedOption::IsInitialized() const { + if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false; + return true; +} + +void UninterpretedOption::Swap(UninterpretedOption* other) { + if (other == this) return; + InternalSwap(other); +} +void UninterpretedOption::InternalSwap(UninterpretedOption* other) { + name_.UnsafeArenaSwap(&other->name_); + identifier_value_.Swap(&other->identifier_value_); + string_value_.Swap(&other->string_value_); + aggregate_value_.Swap(&other->aggregate_value_); + std::swap(positive_int_value_, other->positive_int_value_); + std::swap(negative_int_value_, other->negative_int_value_); + std::swap(double_value_, other->double_value_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); +} + +::google::protobuf::Metadata UninterpretedOption::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[20]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// UninterpretedOption + +// repeated .google.protobuf.UninterpretedOption.NamePart name = 2; +int UninterpretedOption::name_size() const { + return name_.size(); +} +void UninterpretedOption::clear_name() { + name_.Clear(); +} +const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name) + return name_.Get(index); +} +::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name) + return name_.Mutable(index); +} +::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() { + // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name) + return name_.Add(); +} +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >* +UninterpretedOption::mutable_name() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name) + return &name_; +} +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >& +UninterpretedOption::name() const { + // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name) + return name_; +} + +// optional string identifier_value = 3; +bool UninterpretedOption::has_identifier_value() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void UninterpretedOption::set_has_identifier_value() { + _has_bits_[0] |= 0x00000001u; +} +void UninterpretedOption::clear_has_identifier_value() { + _has_bits_[0] &= ~0x00000001u; +} +void UninterpretedOption::clear_identifier_value() { + identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_identifier_value(); +} +const ::std::string& UninterpretedOption::identifier_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value) + return identifier_value_.GetNoArena(); +} +void UninterpretedOption::set_identifier_value(const ::std::string& value) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value) +} +#if LANG_CXX11 +void UninterpretedOption::set_identifier_value(::std::string&& value) { + set_has_identifier_value(); + identifier_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.identifier_value) +} +#endif +void UninterpretedOption::set_identifier_value(const char* value) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value) +} +void UninterpretedOption::set_identifier_value(const char* value, size_t size) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value) +} +::std::string* UninterpretedOption::mutable_identifier_value() { + set_has_identifier_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value) + return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_identifier_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value) + clear_has_identifier_value(); + return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) { + if (identifier_value != NULL) { + set_has_identifier_value(); + } else { + clear_has_identifier_value(); + } + identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value) +} + +// optional uint64 positive_int_value = 4; +bool UninterpretedOption::has_positive_int_value() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +void UninterpretedOption::set_has_positive_int_value() { + _has_bits_[0] |= 0x00000008u; +} +void UninterpretedOption::clear_has_positive_int_value() { + _has_bits_[0] &= ~0x00000008u; +} +void UninterpretedOption::clear_positive_int_value() { + positive_int_value_ = GOOGLE_ULONGLONG(0); + clear_has_positive_int_value(); +} +::google::protobuf::uint64 UninterpretedOption::positive_int_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value) + return positive_int_value_; +} +void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) { + set_has_positive_int_value(); + positive_int_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value) +} + +// optional int64 negative_int_value = 5; +bool UninterpretedOption::has_negative_int_value() const { + return (_has_bits_[0] & 0x00000010u) != 0; +} +void UninterpretedOption::set_has_negative_int_value() { + _has_bits_[0] |= 0x00000010u; +} +void UninterpretedOption::clear_has_negative_int_value() { + _has_bits_[0] &= ~0x00000010u; +} +void UninterpretedOption::clear_negative_int_value() { + negative_int_value_ = GOOGLE_LONGLONG(0); + clear_has_negative_int_value(); +} +::google::protobuf::int64 UninterpretedOption::negative_int_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value) + return negative_int_value_; +} +void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) { + set_has_negative_int_value(); + negative_int_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value) +} + +// optional double double_value = 6; +bool UninterpretedOption::has_double_value() const { + return (_has_bits_[0] & 0x00000020u) != 0; +} +void UninterpretedOption::set_has_double_value() { + _has_bits_[0] |= 0x00000020u; +} +void UninterpretedOption::clear_has_double_value() { + _has_bits_[0] &= ~0x00000020u; +} +void UninterpretedOption::clear_double_value() { + double_value_ = 0; + clear_has_double_value(); +} +double UninterpretedOption::double_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value) + return double_value_; +} +void UninterpretedOption::set_double_value(double value) { + set_has_double_value(); + double_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value) +} + +// optional bytes string_value = 7; +bool UninterpretedOption::has_string_value() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void UninterpretedOption::set_has_string_value() { + _has_bits_[0] |= 0x00000002u; +} +void UninterpretedOption::clear_has_string_value() { + _has_bits_[0] &= ~0x00000002u; +} +void UninterpretedOption::clear_string_value() { + string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_string_value(); +} +const ::std::string& UninterpretedOption::string_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value) + return string_value_.GetNoArena(); +} +void UninterpretedOption::set_string_value(const ::std::string& value) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value) +} +#if LANG_CXX11 +void UninterpretedOption::set_string_value(::std::string&& value) { + set_has_string_value(); + string_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.string_value) +} +#endif +void UninterpretedOption::set_string_value(const char* value) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value) +} +void UninterpretedOption::set_string_value(const void* value, size_t size) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value) +} +::std::string* UninterpretedOption::mutable_string_value() { + set_has_string_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value) + return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_string_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value) + clear_has_string_value(); + return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_string_value(::std::string* string_value) { + if (string_value != NULL) { + set_has_string_value(); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo.Location) - MergeFrom(*source); + clear_has_string_value(); } + string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value) } -void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - path_.MergeFrom(from.path_); - span_.MergeFrom(from.span_); - leading_detached_comments_.MergeFrom(from.leading_detached_comments_); - if (from._has_bits_[2 / 32] & (0xffu << (2 % 32))) { - if (from.has_leading_comments()) { - set_has_leading_comments(); - leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); - } - if (from.has_trailing_comments()) { - set_has_trailing_comments(); - trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } +// optional string aggregate_value = 8; +bool UninterpretedOption::has_aggregate_value() const { + return (_has_bits_[0] & 0x00000004u) != 0; } - -void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location) - if (&from == this) return; - Clear(); - MergeFrom(from); +void UninterpretedOption::set_has_aggregate_value() { + _has_bits_[0] |= 0x00000004u; } - -void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location) - if (&from == this) return; - Clear(); - MergeFrom(from); +void UninterpretedOption::clear_has_aggregate_value() { + _has_bits_[0] &= ~0x00000004u; } - -bool SourceCodeInfo_Location::IsInitialized() const { - - return true; +void UninterpretedOption::clear_aggregate_value() { + aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_aggregate_value(); } - -void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) { - if (other == this) return; - InternalSwap(other); +const ::std::string& UninterpretedOption::aggregate_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value) + return aggregate_value_.GetNoArena(); } -void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) { - path_.UnsafeArenaSwap(&other->path_); - span_.UnsafeArenaSwap(&other->span_); - leading_comments_.Swap(&other->leading_comments_); - trailing_comments_.Swap(&other->trailing_comments_); - leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _internal_metadata_.Swap(&other->_internal_metadata_); - std::swap(_cached_size_, other->_cached_size_); +void UninterpretedOption::set_aggregate_value(const ::std::string& value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value) } - -::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = SourceCodeInfo_Location_descriptor_; - metadata.reflection = SourceCodeInfo_Location_reflection_; - return metadata; +#if LANG_CXX11 +void UninterpretedOption::set_aggregate_value(::std::string&& value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.aggregate_value) +} +#endif +void UninterpretedOption::set_aggregate_value(const char* value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.aggregate_value) +} +void UninterpretedOption::set_aggregate_value(const char* value, size_t size) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.aggregate_value) +} +::std::string* UninterpretedOption::mutable_aggregate_value() { + set_has_aggregate_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value) + return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_aggregate_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value) + clear_has_aggregate_value(); + return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) { + if (aggregate_value != NULL) { + set_has_aggregate_value(); + } else { + clear_has_aggregate_value(); + } + aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int SourceCodeInfo::kLocationFieldNumber; +const int SourceCodeInfo_Location::kPathFieldNumber; +const int SourceCodeInfo_Location::kSpanFieldNumber; +const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber; +const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber; +const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -SourceCodeInfo::SourceCodeInfo() +SourceCodeInfo_Location::SourceCodeInfo_Location() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo) -} - -void SourceCodeInfo::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo.Location) } - -SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from) +SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + path_(from.path_), + span_(from.span_), + leading_detached_comments_(from.leading_detached_comments_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_leading_comments()) { + leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); + } + trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_trailing_comments()) { + trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); + } + // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location) } -void SourceCodeInfo::SharedCtor() { +void SourceCodeInfo_Location::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -SourceCodeInfo::~SourceCodeInfo() { - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo) +SourceCodeInfo_Location::~SourceCodeInfo_Location() { + // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location) SharedDtor(); } -void SourceCodeInfo::SharedDtor() { - if (this != default_instance_) { - } +void SourceCodeInfo_Location::SharedDtor() { + leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -void SourceCodeInfo::SetCachedSize(int size) const { +void SourceCodeInfo_Location::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() { +const ::google::protobuf::Descriptor* SourceCodeInfo_Location::descriptor() { protobuf_AssignDescriptorsOnce(); - return SourceCodeInfo_descriptor_; + return file_level_metadata[21].descriptor; } -const SourceCodeInfo& SourceCodeInfo::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const SourceCodeInfo_Location& SourceCodeInfo_Location::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -SourceCodeInfo* SourceCodeInfo::default_instance_ = NULL; - -SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const { - SourceCodeInfo* n = new SourceCodeInfo; +SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena* arena) const { + SourceCodeInfo_Location* n = new SourceCodeInfo_Location; if (arena != NULL) { arena->Own(n); } return n; } -void SourceCodeInfo::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) - location_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } -} +void SourceCodeInfo_Location::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) + path_.Clear(); + span_.Clear(); + leading_detached_comments_.Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_leading_comments()) { + GOOGLE_DCHECK(!leading_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*leading_comments_.UnsafeRawStringPointer())->clear(); + } + if (has_trailing_comments()) { + GOOGLE_DCHECK(!trailing_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*trailing_comments_.UnsafeRawStringPointer())->clear(); + } + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); +} + +bool SourceCodeInfo_Location::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated int32 path = 1 [packed = true]; + case 1: { + if (tag == 10u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, this->mutable_path()))); + } else if (tag == 8u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + 1, 10u, input, this->mutable_path()))); + } else { + goto handle_unusual; + } + break; + } + + // repeated int32 span = 2 [packed = true]; + case 2: { + if (tag == 18u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, this->mutable_span()))); + } else if (tag == 16u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + 1, 18u, input, this->mutable_span()))); + } else { + goto handle_unusual; + } + break; + } + + // optional string leading_comments = 3; + case 3: { + if (tag == 26u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_leading_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + } else { + goto handle_unusual; + } + break; + } -bool SourceCodeInfo::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - case 1: { - if (tag == 10) { - DO_(input->IncrementRecursionDepth()); - parse_loop_location: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( - input, add_location())); + // optional string trailing_comments = 4; + case 4: { + if (tag == 34u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_trailing_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + } else { + goto handle_unusual; + } + break; + } + + // repeated string leading_detached_comments = 6; + case 6: { + if (tag == 50u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->add_leading_detached_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(this->leading_detached_comments_size() - 1).data(), + this->leading_detached_comments(this->leading_detached_comments_size() - 1).length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_location; - input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -13940,131 +13958,294 @@ bool SourceCodeInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo.Location) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo.Location) return false; #undef DO_ } -void SourceCodeInfo::SerializeWithCachedSizes( +void SourceCodeInfo_Location::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo) - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - for (unsigned int i = 0, n = this->location_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->location(i), output); + // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo.Location) + // repeated int32 path = 1 [packed = true]; + if (this->path_size() > 0) { + ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); + output->WriteVarint32(_path_cached_byte_size_); + } + for (int i = 0; i < this->path_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( + this->path(i), output); + } + + // repeated int32 span = 2 [packed = true]; + if (this->span_size() > 0) { + ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); + output->WriteVarint32(_span_cached_byte_size_); + } + for (int i = 0; i < this->span_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( + this->span(i), output); + } + + // optional string leading_comments = 3; + if (has_leading_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->leading_comments(), output); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 4, this->trailing_comments(), output); + } + + // repeated string leading_detached_comments = 6; + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 6, this->leading_detached_comments(i), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location) } -::google::protobuf::uint8* SourceCodeInfo::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo) - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - for (unsigned int i = 0, n = this->location_size(); i < n; i++) { +::google::protobuf::uint8* SourceCodeInfo_Location::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location) + // repeated int32 path = 1 [packed = true]; + if (this->path_size() > 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( + 1, + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, + target); + target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( + _path_cached_byte_size_, target); + } + for (int i = 0; i < this->path_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteInt32NoTagToArray(this->path(i), target); + } + + // repeated int32 span = 2 [packed = true]; + if (this->span_size() > 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( + 2, + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, + target); + target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( + _span_cached_byte_size_, target); + } + for (int i = 0; i < this->span_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteInt32NoTagToArray(this->span(i), target); + } + + // optional string leading_comments = 3; + if (has_leading_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->leading_comments(), target); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 4, this->trailing_comments(), target); + } + + // repeated string leading_detached_comments = 6; + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->location(i), target); + WriteStringToArray(6, this->leading_detached_comments(i), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location) return target; } -int SourceCodeInfo::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo) - int total_size = 0; - - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - total_size += 1 * this->location_size(); - for (int i = 0; i < this->location_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->location(i)); - } +size_t SourceCodeInfo_Location::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location) + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated int32 path = 1 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->path_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->path(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _path_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } + + // repeated int32 span = 2 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->span_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->span(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _span_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } + + // repeated string leading_detached_comments = 6; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->leading_detached_comments_size()); + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( + this->leading_detached_comments(i)); + } + + if (_has_bits_[0 / 32] & 3u) { + // optional string leading_comments = 3; + if (has_leading_comments()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->leading_comments()); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->trailing_comments()); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const SourceCodeInfo* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo.Location) + GOOGLE_DCHECK_NE(&from, this); + const SourceCodeInfo_Location* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo.Location) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo.Location) MergeFrom(*source); } } - -void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - location_.MergeFrom(from.location_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + +void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + path_.MergeFrom(from.path_); + span_.MergeFrom(from.span_); + leading_detached_comments_.MergeFrom(from.leading_detached_comments_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_leading_comments()) { + set_has_leading_comments(); + leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); + } + if (from.has_trailing_comments()) { + set_has_trailing_comments(); + trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); + } } } -void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo) +void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location) if (&from == this) return; Clear(); MergeFrom(from); } -void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo) +void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location) if (&from == this) return; Clear(); MergeFrom(from); } -bool SourceCodeInfo::IsInitialized() const { - +bool SourceCodeInfo_Location::IsInitialized() const { return true; } -void SourceCodeInfo::Swap(SourceCodeInfo* other) { +void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) { if (other == this) return; InternalSwap(other); } -void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) { - location_.UnsafeArenaSwap(&other->location_); +void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) { + path_.UnsafeArenaSwap(&other->path_); + span_.UnsafeArenaSwap(&other->span_); + leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_); + leading_comments_.Swap(&other->leading_comments_); + trailing_comments_.Swap(&other->trailing_comments_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); } -::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const { +::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = SourceCodeInfo_descriptor_; - metadata.reflection = SourceCodeInfo_reflection_; - return metadata; + return file_level_metadata[21]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -14077,24 +14258,24 @@ int SourceCodeInfo_Location::path_size() const { void SourceCodeInfo_Location::clear_path() { path_.Clear(); } - ::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const { +::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path) return path_.Get(index); } - void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) { +void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) { path_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path) } - void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) { +void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) { path_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& SourceCodeInfo_Location::path() const { // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path) return path_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* SourceCodeInfo_Location::mutable_path() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path) return &path_; @@ -14107,24 +14288,24 @@ int SourceCodeInfo_Location::span_size() const { void SourceCodeInfo_Location::clear_span() { span_.Clear(); } - ::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const { +::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span) return span_.Get(index); } - void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) { +void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) { span_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span) } - void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) { +void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) { span_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& SourceCodeInfo_Location::span() const { // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span) return span_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* SourceCodeInfo_Location::mutable_span() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span) return &span_; @@ -14132,49 +14313,57 @@ SourceCodeInfo_Location::mutable_span() { // optional string leading_comments = 3; bool SourceCodeInfo_Location::has_leading_comments() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000001u) != 0; } void SourceCodeInfo_Location::set_has_leading_comments() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000001u; } void SourceCodeInfo_Location::clear_has_leading_comments() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000001u; } void SourceCodeInfo_Location::clear_leading_comments() { leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_leading_comments(); } - const ::std::string& SourceCodeInfo_Location::leading_comments() const { +const ::std::string& SourceCodeInfo_Location::leading_comments() const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments) - return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return leading_comments_.GetNoArena(); } - void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) { +void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments) } - void SourceCodeInfo_Location::set_leading_comments(const char* value) { +#if LANG_CXX11 +void SourceCodeInfo_Location::set_leading_comments(::std::string&& value) { + set_has_leading_comments(); + leading_comments_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.SourceCodeInfo.Location.leading_comments) +} +#endif +void SourceCodeInfo_Location::set_leading_comments(const char* value) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_comments) } - void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) { +void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_comments) } - ::std::string* SourceCodeInfo_Location::mutable_leading_comments() { +::std::string* SourceCodeInfo_Location::mutable_leading_comments() { set_has_leading_comments(); // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_comments) return leading_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* SourceCodeInfo_Location::release_leading_comments() { +::std::string* SourceCodeInfo_Location::release_leading_comments() { // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments) clear_has_leading_comments(); return leading_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) { +void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) { if (leading_comments != NULL) { set_has_leading_comments(); } else { @@ -14186,115 +14375,353 @@ void SourceCodeInfo_Location::clear_leading_comments() { // optional string trailing_comments = 4; bool SourceCodeInfo_Location::has_trailing_comments() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void SourceCodeInfo_Location::set_has_trailing_comments() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000002u; } void SourceCodeInfo_Location::clear_has_trailing_comments() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000002u; } void SourceCodeInfo_Location::clear_trailing_comments() { trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_trailing_comments(); } - const ::std::string& SourceCodeInfo_Location::trailing_comments() const { +const ::std::string& SourceCodeInfo_Location::trailing_comments() const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments) - return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return trailing_comments_.GetNoArena(); } - void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) { +void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - void SourceCodeInfo_Location::set_trailing_comments(const char* value) { +#if LANG_CXX11 +void SourceCodeInfo_Location::set_trailing_comments(::std::string&& value) { + set_has_trailing_comments(); + trailing_comments_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.SourceCodeInfo.Location.trailing_comments) +} +#endif +void SourceCodeInfo_Location::set_trailing_comments(const char* value) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) { +void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - ::std::string* SourceCodeInfo_Location::mutable_trailing_comments() { +::std::string* SourceCodeInfo_Location::mutable_trailing_comments() { set_has_trailing_comments(); // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.trailing_comments) return trailing_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* SourceCodeInfo_Location::release_trailing_comments() { +::std::string* SourceCodeInfo_Location::release_trailing_comments() { // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments) clear_has_trailing_comments(); return trailing_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) { +void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) { if (trailing_comments != NULL) { set_has_trailing_comments(); } else { - clear_has_trailing_comments(); + clear_has_trailing_comments(); + } + trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments) +} + +// repeated string leading_detached_comments = 6; +int SourceCodeInfo_Location::leading_detached_comments_size() const { + return leading_detached_comments_.size(); +} +void SourceCodeInfo_Location::clear_leading_detached_comments() { + leading_detached_comments_.Clear(); +} +const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Get(index); +} +::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Mutable(index); +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + leading_detached_comments_.Mutable(index)->assign(value); +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) { + leading_detached_comments_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) { + leading_detached_comments_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +::std::string* SourceCodeInfo_Location::add_leading_detached_comments() { + // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Add(); +} +void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) { + leading_detached_comments_.Add()->assign(value); + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) { + leading_detached_comments_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) { + leading_detached_comments_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +const ::google::protobuf::RepeatedPtrField< ::std::string>& +SourceCodeInfo_Location::leading_detached_comments() const { + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_; +} +::google::protobuf::RepeatedPtrField< ::std::string>* +SourceCodeInfo_Location::mutable_leading_detached_comments() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return &leading_detached_comments_; +} + +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS + +// =================================================================== + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int SourceCodeInfo::kLocationFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +SourceCodeInfo::SourceCodeInfo() + : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } + SharedCtor(); + // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo) +} +SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from) + : ::google::protobuf::Message(), + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + location_(from.location_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo) +} + +void SourceCodeInfo::SharedCtor() { + _cached_size_ = 0; +} + +SourceCodeInfo::~SourceCodeInfo() { + // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo) + SharedDtor(); +} + +void SourceCodeInfo::SharedDtor() { +} + +void SourceCodeInfo::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[22].descriptor; +} + +const SourceCodeInfo& SourceCodeInfo::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); +} + +SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const { + SourceCodeInfo* n = new SourceCodeInfo; + if (arena != NULL) { + arena->Own(n); + } + return n; +} + +void SourceCodeInfo::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) + location_.Clear(); + _has_bits_.Clear(); + _internal_metadata_.Clear(); +} + +bool SourceCodeInfo::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + case 1: { + if (tag == 10u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_location())); + } else { + goto handle_unusual; + } + input->UnsafeDecrementRecursionDepth(); + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo) + return true; +failure: + // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo) + return false; +#undef DO_ +} + +void SourceCodeInfo::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo) + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + for (unsigned int i = 0, n = this->location_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->location(i), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo) +} + +::google::protobuf::uint8* SourceCodeInfo::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo) + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + for (unsigned int i = 0, n = this->location_size(); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 1, this->location(i), false, target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo) + return target; +} + +size_t SourceCodeInfo::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + { + unsigned int count = this->location_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->location(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo) + GOOGLE_DCHECK_NE(&from, this); + const SourceCodeInfo* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo) + MergeFrom(*source); } - trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments) } -// repeated string leading_detached_comments = 6; -int SourceCodeInfo_Location::leading_detached_comments_size() const { - return leading_detached_comments_.size(); -} -void SourceCodeInfo_Location::clear_leading_detached_comments() { - leading_detached_comments_.Clear(); -} - const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Get(index); -} - ::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Mutable(index); -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - leading_detached_comments_.Mutable(index)->assign(value); -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) { - leading_detached_comments_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) { - leading_detached_comments_.Mutable(index)->assign( - reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) -} - ::std::string* SourceCodeInfo_Location::add_leading_detached_comments() { - // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Add(); +void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + location_.MergeFrom(from.location_); } - void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) { - leading_detached_comments_.Add()->assign(value); - // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo) + if (&from == this) return; + Clear(); + MergeFrom(from); } - void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) { - leading_detached_comments_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo) + if (&from == this) return; + Clear(); + MergeFrom(from); } - void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) { - leading_detached_comments_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +bool SourceCodeInfo::IsInitialized() const { + return true; } - const ::google::protobuf::RepeatedPtrField< ::std::string>& -SourceCodeInfo_Location::leading_detached_comments() const { - // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_; + +void SourceCodeInfo::Swap(SourceCodeInfo* other) { + if (other == this) return; + InternalSwap(other); } - ::google::protobuf::RepeatedPtrField< ::std::string>* -SourceCodeInfo_Location::mutable_leading_detached_comments() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return &leading_detached_comments_; +void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) { + location_.UnsafeArenaSwap(&other->location_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); } -// ------------------------------------------------------------------- +::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[22]; +} +#if PROTOBUF_INLINE_NOT_IN_HEADERS // SourceCodeInfo // repeated .google.protobuf.SourceCodeInfo.Location location = 1; @@ -14340,28 +14767,34 @@ const int GeneratedCodeInfo_Annotation::kEndFieldNumber; GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo.Annotation) } - -void GeneratedCodeInfo_Annotation::InitAsDefaultInstance() { -} - GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + path_(from.path_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_source_file()) { + source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); + } + ::memcpy(&begin_, &from.begin_, + reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo.Annotation) } void GeneratedCodeInfo_Annotation::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - begin_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&begin_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); } GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() { @@ -14371,8 +14804,6 @@ GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() { void GeneratedCodeInfo_Annotation::SharedDtor() { source_file_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } } void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const { @@ -14382,16 +14813,14 @@ void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation::descriptor() { protobuf_AssignDescriptorsOnce(); - return GeneratedCodeInfo_Annotation_descriptor_; + return file_level_metadata[23].descriptor; } const GeneratedCodeInfo_Annotation& GeneratedCodeInfo_Annotation::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::default_instance_ = NULL; - GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protobuf::Arena* arena) const { GeneratedCodeInfo_Annotation* n = new GeneratedCodeInfo_Annotation; if (arena != NULL) { @@ -14402,37 +14831,17 @@ GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protob void GeneratedCodeInfo_Annotation::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(GeneratedCodeInfo_Annotation, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 14u) { - ZR_(begin_, end_); - if (has_source_file()) { - source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - -#undef ZR_HELPER_ -#undef ZR_ - path_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (has_source_file()) { + GOOGLE_DCHECK(!source_file_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*source_file_.UnsafeRawStringPointer())->clear(); + } + if (_has_bits_[0 / 32] & 6u) { + ::memset(&begin_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( @@ -14441,31 +14850,29 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo.Annotation) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated int32 path = 1 [packed = true]; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_path()))); - } else if (tag == 8) { + } else if (tag == 8u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 10, input, this->mutable_path()))); + 1, 10u, input, this->mutable_path()))); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_source_file; break; } // optional string source_file = 2; case 2: { - if (tag == 18) { - parse_source_file: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_source_file())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -14475,37 +14882,32 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_begin; break; } // optional int32 begin = 3; case 3: { - if (tag == 24) { - parse_begin: + if (tag == 24u) { + set_has_begin(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &begin_))); - set_has_begin(); } else { goto handle_unusual; } - if (input->ExpectTag(32)) goto parse_end; break; } // optional int32 end = 4; case 4: { - if (tag == 32) { - parse_end: + if (tag == 32u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -14571,8 +14973,9 @@ void GeneratedCodeInfo_Annotation::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo.Annotation) } -::google::protobuf::uint8* GeneratedCodeInfo_Annotation::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* GeneratedCodeInfo_Annotation::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo.Annotation) // repeated int32 path = 1 [packed = true]; if (this->path_size() > 0) { @@ -14617,11 +15020,35 @@ ::google::protobuf::uint8* GeneratedCodeInfo_Annotation::SerializeWithCachedSize return target; } -int GeneratedCodeInfo_Annotation::ByteSize() const { +size_t GeneratedCodeInfo_Annotation::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo.Annotation) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated int32 path = 1 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->path_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->path(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _path_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } - if (_has_bits_[1 / 32] & 14u) { + if (_has_bits_[0 / 32] & 7u) { // optional string source_file = 2; if (has_source_file()) { total_size += 1 + @@ -14644,113 +15071,230 @@ int GeneratedCodeInfo_Annotation::ByteSize() const { } } - // repeated int32 path = 1 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->path_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->path(i)); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void GeneratedCodeInfo_Annotation::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + GOOGLE_DCHECK_NE(&from, this); + const GeneratedCodeInfo_Annotation* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation) + MergeFrom(*source); + } +} + +void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + path_.MergeFrom(from.path_); + if (from._has_bits_[0 / 32] & 7u) { + if (from.has_source_file()) { + set_has_source_file(); + source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); } - if (data_size > 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + if (from.has_begin()) { + set_begin(from.begin()); + } + if (from.has_end()) { + set_end(from.end()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _path_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; } +} - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; +void GeneratedCodeInfo_Annotation::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GeneratedCodeInfo_Annotation::IsInitialized() const { + return true; +} + +void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) { + if (other == this) return; + InternalSwap(other); +} +void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) { + path_.UnsafeArenaSwap(&other->path_); + source_file_.Swap(&other->source_file_); + std::swap(begin_, other->begin_); + std::swap(end_, other->end_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); +} + +::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[23]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// GeneratedCodeInfo_Annotation + +// repeated int32 path = 1 [packed = true]; +int GeneratedCodeInfo_Annotation::path_size() const { + return path_.size(); +} +void GeneratedCodeInfo_Annotation::clear_path() { + path_.Clear(); +} +::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path) + return path_.Get(index); +} +void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) { + path_.Set(index, value); + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path) +} +void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) { + path_.Add(value); + // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path) +} +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +GeneratedCodeInfo_Annotation::path() const { + // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path) + return path_; +} +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +GeneratedCodeInfo_Annotation::mutable_path() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path) + return &path_; +} + +// optional string source_file = 2; +bool GeneratedCodeInfo_Annotation::has_source_file() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void GeneratedCodeInfo_Annotation::set_has_source_file() { + _has_bits_[0] |= 0x00000001u; +} +void GeneratedCodeInfo_Annotation::clear_has_source_file() { + _has_bits_[0] &= ~0x00000001u; +} +void GeneratedCodeInfo_Annotation::clear_source_file() { + source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_source_file(); +} +const ::std::string& GeneratedCodeInfo_Annotation::source_file() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + return source_file_.GetNoArena(); +} +void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +#if LANG_CXX11 +void GeneratedCodeInfo_Annotation::set_source_file(::std::string&& value) { + set_has_source_file(); + source_file_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.GeneratedCodeInfo.Annotation.source_file) } - -void GeneratedCodeInfo_Annotation::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const GeneratedCodeInfo_Annotation* source = - ::google::protobuf::internal::DynamicCastToGenerated( - &from); - if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); +#endif +void GeneratedCodeInfo_Annotation::set_source_file(const char* value) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() { + set_has_source_file(); + // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* GeneratedCodeInfo_Annotation::release_source_file() { + // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + clear_has_source_file(); + return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) { + if (source_file != NULL) { + set_has_source_file(); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation) - MergeFrom(*source); + clear_has_source_file(); } + source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file) } -void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - path_.MergeFrom(from.path_); - if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { - if (from.has_source_file()) { - set_has_source_file(); - source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); - } - if (from.has_begin()) { - set_begin(from.begin()); - } - if (from.has_end()) { - set_end(from.end()); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } +// optional int32 begin = 3; +bool GeneratedCodeInfo_Annotation::has_begin() const { + return (_has_bits_[0] & 0x00000002u) != 0; } - -void GeneratedCodeInfo_Annotation::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (&from == this) return; - Clear(); - MergeFrom(from); +void GeneratedCodeInfo_Annotation::set_has_begin() { + _has_bits_[0] |= 0x00000002u; } - -void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (&from == this) return; - Clear(); - MergeFrom(from); +void GeneratedCodeInfo_Annotation::clear_has_begin() { + _has_bits_[0] &= ~0x00000002u; } - -bool GeneratedCodeInfo_Annotation::IsInitialized() const { - - return true; +void GeneratedCodeInfo_Annotation::clear_begin() { + begin_ = 0; + clear_has_begin(); } - -void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) { - if (other == this) return; - InternalSwap(other); +::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin) + return begin_; } -void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) { - path_.UnsafeArenaSwap(&other->path_); - source_file_.Swap(&other->source_file_); - std::swap(begin_, other->begin_); - std::swap(end_, other->end_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _internal_metadata_.Swap(&other->_internal_metadata_); - std::swap(_cached_size_, other->_cached_size_); +void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) { + set_has_begin(); + begin_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin) } -::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = GeneratedCodeInfo_Annotation_descriptor_; - metadata.reflection = GeneratedCodeInfo_Annotation_reflection_; - return metadata; +// optional int32 end = 4; +bool GeneratedCodeInfo_Annotation::has_end() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +void GeneratedCodeInfo_Annotation::set_has_end() { + _has_bits_[0] |= 0x00000004u; +} +void GeneratedCodeInfo_Annotation::clear_has_end() { + _has_bits_[0] &= ~0x00000004u; +} +void GeneratedCodeInfo_Annotation::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.end) + return end_; +} +void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GeneratedCodeInfo::kAnnotationFieldNumber; @@ -14758,24 +15302,24 @@ const int GeneratedCodeInfo::kAnnotationFieldNumber; GeneratedCodeInfo::GeneratedCodeInfo() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo) } - -void GeneratedCodeInfo::InitAsDefaultInstance() { -} - GeneratedCodeInfo::GeneratedCodeInfo(const GeneratedCodeInfo& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + annotation_(from.annotation_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo) } void GeneratedCodeInfo::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } GeneratedCodeInfo::~GeneratedCodeInfo() { @@ -14784,8 +15328,6 @@ GeneratedCodeInfo::~GeneratedCodeInfo() { } void GeneratedCodeInfo::SharedDtor() { - if (this != default_instance_) { - } } void GeneratedCodeInfo::SetCachedSize(int size) const { @@ -14795,16 +15337,14 @@ void GeneratedCodeInfo::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* GeneratedCodeInfo::descriptor() { protobuf_AssignDescriptorsOnce(); - return GeneratedCodeInfo_descriptor_; + return file_level_metadata[24].descriptor; } const GeneratedCodeInfo& GeneratedCodeInfo::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -GeneratedCodeInfo* GeneratedCodeInfo::default_instance_ = NULL; - GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) const { GeneratedCodeInfo* n = new GeneratedCodeInfo; if (arena != NULL) { @@ -14816,10 +15356,8 @@ GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) cons void GeneratedCodeInfo::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo) annotation_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool GeneratedCodeInfo::MergePartialFromCodedStream( @@ -14828,23 +15366,20 @@ bool GeneratedCodeInfo::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(input->IncrementRecursionDepth()); - parse_loop_annotation: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_annotation())); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_annotation; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -14886,14 +15421,15 @@ void GeneratedCodeInfo::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo) } -::google::protobuf::uint8* GeneratedCodeInfo::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* GeneratedCodeInfo::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo) // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; for (unsigned int i = 0, n = this->annotation_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->annotation(i), target); + InternalWriteMessageNoVirtualToArray( + 1, this->annotation(i), false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -14904,33 +15440,37 @@ ::google::protobuf::uint8* GeneratedCodeInfo::SerializeWithCachedSizesToArray( return target; } -int GeneratedCodeInfo::ByteSize() const { +size_t GeneratedCodeInfo::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo) - int total_size = 0; - - // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; - total_size += 1 * this->annotation_size(); - for (int i = 0; i < this->annotation_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->annotation(i)); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; + { + unsigned int count = this->annotation_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->annotation(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const GeneratedCodeInfo* source = + GOOGLE_DCHECK_NE(&from, this); + const GeneratedCodeInfo* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -14944,11 +15484,9 @@ void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { void GeneratedCodeInfo::MergeFrom(const GeneratedCodeInfo& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); annotation_.MergeFrom(from.annotation_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void GeneratedCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { @@ -14966,7 +15504,6 @@ void GeneratedCodeInfo::CopyFrom(const GeneratedCodeInfo& from) { } bool GeneratedCodeInfo::IsInitialized() const { - return true; } @@ -14983,149 +15520,10 @@ void GeneratedCodeInfo::InternalSwap(GeneratedCodeInfo* other) { ::google::protobuf::Metadata GeneratedCodeInfo::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = GeneratedCodeInfo_descriptor_; - metadata.reflection = GeneratedCodeInfo_reflection_; - return metadata; + return file_level_metadata[24]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// GeneratedCodeInfo_Annotation - -// repeated int32 path = 1 [packed = true]; -int GeneratedCodeInfo_Annotation::path_size() const { - return path_.size(); -} -void GeneratedCodeInfo_Annotation::clear_path() { - path_.Clear(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path) - return path_.Get(index); -} - void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) { - path_.Set(index, value); - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path) -} - void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) { - path_.Add(value); - // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path) -} - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& -GeneratedCodeInfo_Annotation::path() const { - // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path) - return path_; -} - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* -GeneratedCodeInfo_Annotation::mutable_path() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path) - return &path_; -} - -// optional string source_file = 2; -bool GeneratedCodeInfo_Annotation::has_source_file() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_source_file() { - _has_bits_[0] |= 0x00000002u; -} -void GeneratedCodeInfo_Annotation::clear_has_source_file() { - _has_bits_[0] &= ~0x00000002u; -} -void GeneratedCodeInfo_Annotation::clear_source_file() { - source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_source_file(); -} - const ::std::string& GeneratedCodeInfo_Annotation::source_file() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - return source_file_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - void GeneratedCodeInfo_Annotation::set_source_file(const char* value) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - ::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() { - set_has_source_file(); - // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* GeneratedCodeInfo_Annotation::release_source_file() { - // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - clear_has_source_file(); - return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) { - if (source_file != NULL) { - set_has_source_file(); - } else { - clear_has_source_file(); - } - source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - -// optional int32 begin = 3; -bool GeneratedCodeInfo_Annotation::has_begin() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_begin() { - _has_bits_[0] |= 0x00000004u; -} -void GeneratedCodeInfo_Annotation::clear_has_begin() { - _has_bits_[0] &= ~0x00000004u; -} -void GeneratedCodeInfo_Annotation::clear_begin() { - begin_ = 0; - clear_has_begin(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin) - return begin_; -} - void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) { - set_has_begin(); - begin_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin) -} - -// optional int32 end = 4; -bool GeneratedCodeInfo_Annotation::has_end() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_end() { - _has_bits_[0] |= 0x00000008u; -} -void GeneratedCodeInfo_Annotation::clear_has_end() { - _has_bits_[0] &= ~0x00000008u; -} -void GeneratedCodeInfo_Annotation::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.end) - return end_; -} - void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end) -} - -// ------------------------------------------------------------------- - // GeneratedCodeInfo // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; From a74fa9b677fdf3b4b6510c6a3f4b58404989de47 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 21:15:34 -0400 Subject: [PATCH 10/18] refactor 2.0.1 block of changelog (#370) Fixed blatantly incorrect date Including items that e.g. describe changes to the changelog just bloats the changelog. It's supposed to be the point of reference for consumer-facing changes IIRC. Before 2.0, no changelog talked about tooling that didn't affect the code or tests either. --- CHANGELOG.rst | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2555e1c..73b55a8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,23 +9,18 @@ Changelog * The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) -2.0.1 (2025-03-09) +2.0.1 (2025-04-02) ================== Yet another overdue... hotfix. Sorry this took so long. -* The false positive for indented function parameters in namespaces was eradicated by @norab0130 in https://github.com/cpplint/cpplint/pull/304 -* IWYU: treat stdio.h the same way as cstdio by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/319 -* README.rst: Add instructions for pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/320 -* PEP 621: Migrate from setup.{py, cfg} to pyproject.toml by @cclauss in https://github.com/cpplint/cpplint/pull/315 -* Prepare for release 2.0.1 and update changelog by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/322 -* Refactor tests and metadata by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/317 -* misc git cleanup by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/340 -* Mypy: static type checker for Python by @cclauss in https://github.com/cpplint/cpplint/pull/345 -* CONTRIBUTING.rst: Default branch is develop, add pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/349 -* Fix test refactoring by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/350 -* suppress C++-only categories on C file extensions by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/318 -* Add a GitHub Action to publish to PyPI by @cclauss in https://github.com/cpplint/cpplint/pull/347 +* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) +* Files that end in ".c", ".C", or ".cu" will now also automatically suppress C++-only categories. Previously, `// NO_LINT_C` was required. (https://github.com/cpplint/cpplint/pull/318) +* build/include-what-you-use now recognizes c-style headers such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* Ruff, mypy, and codespell were ran on the project to improve performance and reader comprehension thanks to @cclauss. + * Tests were refactored away from unittest to improve display with pytest by @cclauss. (https://github.com/cpplint/cpplint/pull/332) +* @Hs293Go fixed an embarrassing typo; the "latch" and "numbers" headers are now recognized correctly instead of "latchnumbers". (https://github.com/cpplint/cpplint/pull/300) +* CLI tests were refactored through, among other things, making adding new .def's easier by migrating to a parameterized setup. (https://github.com/cpplint/cpplint/pull/317) 2.0.0 (2024-10-06) ================== From 350702a4d39395571bd118c9a3cff0a573488d61 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 03:16:55 +0200 Subject: [PATCH 11/18] chore: Prepare for release v2.0.2 (#369) No other open pull requests. @aaronliu0130 has landed some critical changes. * [x] Merge a new pull request that only updates the version number and updates CHANGELOG.rst. * [x] Go to https://github.com/cpplint/cpplint/releases/new * [x] Put in the NEW version number. * [x] Click the Generate release notes button * [x] Click the Save draft button and ask other maintainers to review. * [ ] Ship it and check https://pypi.org/project/cpplint after a few minutes. Draft release: https://github.com/cpplint/cpplint/releases/edit/untagged-bac3df867046406901f0 --------- Co-authored-by: Aaron Liu --- CHANGELOG.rst | 4 ++-- cpplint.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 73b55a8..4ed9f3e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,10 +2,10 @@ Changelog ********* -2.1.0 (TBA) +2.0.2 (2025-04-08) =========== -* Python versions less than 3.9 are no longer supported. +* Python versions less than 3.9 are no longer supported. (https://github.com/cpplint/cpplint/pull/334) * The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) diff --git a/cpplint.py b/cpplint.py index 8498ee6..7abd2ba 100755 --- a/cpplint.py +++ b/cpplint.py @@ -61,7 +61,7 @@ # if empty, use defaults _valid_extensions: set[str] = set() -__VERSION__ = "2.0.1" +__VERSION__ = "2.0.2" _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] From 2d2e1c9bbfd25f0d47e1ee193e7160cda4930b70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:25:32 -0400 Subject: [PATCH 12/18] [pre-commit.ci] pre-commit autoupdate (#374) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7eb37f3..ad76be7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.4 + rev: v0.11.5 hooks: - id: ruff - id: ruff-format From 54f085a6ee825e7adbf244145404f22881617896 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 18 Apr 2025 12:02:48 -0400 Subject: [PATCH 13/18] chore: bump dev version (#378) Per release policy --- CHANGELOG.rst | 3 +++ cpplint.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4ed9f3e..7aa9397 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog ********* +TBA +=== + 2.0.2 (2025-04-08) =========== diff --git a/cpplint.py b/cpplint.py index 7abd2ba..4573d89 100755 --- a/cpplint.py +++ b/cpplint.py @@ -61,7 +61,7 @@ # if empty, use defaults _valid_extensions: set[str] = set() -__VERSION__ = "2.0.2" +__VERSION__ = "2.0.3-dev0" _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] From b32e1f309981df5f3eecc3a65c9ea708cb2eb5ba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:50:14 -0400 Subject: [PATCH 14/18] [pre-commit.ci] pre-commit autoupdate (#379) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad76be7..718e8c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.5 + rev: v0.11.6 hooks: - id: ruff - id: ruff-format From b6ada002ca39c8b55ed08b278e0135c8a940db89 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 18 May 2025 18:39:30 -0400 Subject: [PATCH 15/18] change shebang to python3 (#383) --- cpplint.py | 2 +- cpplint_clitest.py | 2 +- cpplint_unittest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpplint.py b/cpplint.py index 4573d89..e400b05 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # diff --git a/cpplint_clitest.py b/cpplint_clitest.py index b20566f..7cb2047 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 730babd..e36093f 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # From 26af9717305c4e631b8cd582c3dbde692565509e Mon Sep 17 00:00:00 2001 From: Geoffrey Viola Date: Wed, 9 Jul 2025 11:13:46 -0400 Subject: [PATCH 16/18] granular build/namespaces categories Enhance the using directives check by adding more granularity to the warnings. The warnings are split into multiple categories 1. block/namespace scope 2. source/header file 3. literal/nonliteral namespace Possible filter combinations would look like the following 1. Google: None 2. CppCoreGuidelines 1. -build/namespaces/header/block 2. -build/namespaces/source 3. Like CppCoreGuidlines, but disallow non-literal namespaces in source files at namespace scope 1. -build/namespaces/header/block 2. -build/namespaces/source/block 3. -build/namespaces/source/namespace/literal Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cpplint.py | 71 ++++++++++++----- cpplint_unittest.py | 83 ++++++++++++++++---- samples/silly-sample/filters.def | 2 +- samples/silly-sample/includeorder_cfirst.def | 2 +- samples/silly-sample/sed.def | 2 +- samples/silly-sample/simple.def | 2 +- 6 files changed, 124 insertions(+), 38 deletions(-) diff --git a/cpplint.py b/cpplint.py index e400b05..24897da 100755 --- a/cpplint.py +++ b/cpplint.py @@ -308,8 +308,14 @@ "build/include_order", "build/include_what_you_use", "build/namespaces_headers", - "build/namespaces_literals", - "build/namespaces", + "build/namespaces/header/block/literals", + "build/namespaces/header/block/nonliterals", + "build/namespaces/header/namespace/literals", + "build/namespaces/header/namespace/nonliterals", + "build/namespaces/source/block/literals", + "build/namespaces/source/block/nonliterals", + "build/namespaces/source/namespace/literals", + "build/namespaces/source/namespace/nonliterals", "build/printf_format", "build/storage_class", "legal/copyright", @@ -935,6 +941,16 @@ "Missing space after ,": r"s/,\([^ ]\)/, \1/g", } +# Used for backwards compatibility and ease of use +_FILTER_SHORTCUTS = { + "build/namespaces_literals": [ + "build/namespaces/header/block/literals", + "build/namespaces/header/namespace/literals", + "build/namespaces/source/block/literals", + "build/namespaces/source/namespace/literals", + ] +} + # The root directory used for deriving header guard CPP variable. # This is set by --root flag. _root = None @@ -1457,7 +1473,12 @@ def AddFilters(self, filters): for filt in filters.split(","): clean_filt = filt.strip() if clean_filt: - self.filters.append(clean_filt) + if len(clean_filt) > 1 and clean_filt[1:] in _FILTER_SHORTCUTS: + starting_char = clean_filt[0] + new_filters = [starting_char + x for x in _FILTER_SHORTCUTS[clean_filt[1:]]] + self.filters.extend(new_filters) + else: + self.filters.append(clean_filt) for filt in self.filters: if not filt.startswith(("+", "-")): msg = f"Every filter in --filters must start with + or - ({filt} does not)" @@ -3287,6 +3308,14 @@ def InAsmBlock(self): """ return self.stack and self.stack[-1].inline_asm != _NO_ASM + def InBlockScope(self): + """Check if we are currently one level inside a block scope. + + Returns: + True if top of the stack is a block scope, False otherwise. + """ + return len(self.stack) > 0 and not isinstance(self.stack[-1], _NamespaceInfo) + def InTemplateArgumentList(self, clean_lines, linenum, pos): """Check if current position is inside template argument list. @@ -6021,22 +6050,26 @@ def CheckLanguage( ) if re.search(r"\busing namespace\b", line): - if re.search(r"\bliterals\b", line): - error( - filename, - linenum, - "build/namespaces_literals", - 5, - "Do not use namespace using-directives. Use using-declarations instead.", - ) - else: - error( - filename, - linenum, - "build/namespaces", - 5, - "Do not use namespace using-directives. Use using-declarations instead.", - ) + is_literals = re.search(r"\bliterals\b", line) is not None + is_header = not _IsSourceExtension(file_extension) + file_type = "header" if is_header else "source" + + # Check for the block scope for multiline blocks. + # Check if the line starts with the using directive as a heuristic in case it's all one line + is_block_scope = nesting_state.InBlockScope() or not line.startswith("using namespace") + + scope_type = "block" if is_block_scope else "namespace" + literal_type = "literals" if is_literals else "nonliterals" + + specific_category = f"build/namespaces/{file_type}/{scope_type}/{literal_type}" + + error( + filename, + linenum, + specific_category, + 5, + "Do not use namespace using-directives. Use using-declarations instead.", + ) # Detect variable-length arrays. match = re.match(r"\s*(.+::)?(\w+) [a-z]\w*\[(.+)];", line) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index e36093f..574e5fd 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -3640,7 +3640,7 @@ def DoTest(self, lines): assert ( error_collector.Results().count( "Do not use namespace using-directives. Use using-declarations instead. " - "[build/namespaces] [5]" + "[build/namespaces/source/namespace/nonliterals] [5]" ) == 1 ) @@ -3649,20 +3649,6 @@ def DoTest(self, lines): DoTest(self, ["", "", "", "using namespace foo;"]) DoTest(self, ["// hello", "using namespace foo;"]) - def testUsingLiteralsNamespaces(self): - self.TestLint( - "using namespace std::literals;", - "Do not use namespace" - " using-directives. Use using-declarations instead." - " [build/namespaces_literals] [5]", - ) - self.TestLint( - "using namespace std::literals::chrono_literals;", - "Do" - " not use namespace using-directives. Use using-declarations instead." - " [build/namespaces_literals] [5]", - ) - def testNewlineAtEOF(self): def DoTest(self, data, is_missing_eof): error_collector = ErrorCollector(self.assertTrue) @@ -4203,6 +4189,73 @@ def testEndOfNamespaceComments(self): == 0 ) + def testUsingNamespacesGranular(self): + """Test granular using namespace checks for different contexts.""" + + self.TestLanguageRulesCheck( + "foo.h", + "using namespace std;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/namespace/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "using namespace std::chrono::literals;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/namespace/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "using namespace std;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/namespace/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "using namespace std::chrono::literals;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/namespace/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "{ using namespace std; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/block/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "{ using namespace std::chrono::literals; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/block/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "{ using namespace std; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/block/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "{ using namespace std::chrono::literals; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/block/literals] [5]", + ) + def testComma(self): self.TestLint("a = f(1,2);", "Missing space after , [whitespace/comma] [3]") self.TestLint( diff --git a/samples/silly-sample/filters.def b/samples/silly-sample/filters.def index e0fac32..5780b3e 100644 --- a/samples/silly-sample/filters.def +++ b/samples/silly-sample/filters.def @@ -13,7 +13,7 @@ src/sillycode.cpp:1: Include the directory when naming header files [build/inc src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] diff --git a/samples/silly-sample/includeorder_cfirst.def b/samples/silly-sample/includeorder_cfirst.def index a3b30a4..9be5e44 100644 --- a/samples/silly-sample/includeorder_cfirst.def +++ b/samples/silly-sample/includeorder_cfirst.def @@ -11,7 +11,7 @@ src/sillycode.cpp:2: Should have a space between // and comment [whitespace/co src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] diff --git a/samples/silly-sample/sed.def b/samples/silly-sample/sed.def index b3778ee..850a16d 100644 --- a/samples/silly-sample/sed.def +++ b/samples/silly-sample/sed.def @@ -15,7 +15,7 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:2: " is an unapproved C++11 header." [build/c++11] [5] # src/sillycode.cpp:3: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] # src/sillycode.cpp:4: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] -# src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces] [5] +# src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces/source/namespace/nonliterals] [5] # src/sillycode.cpp:8: "public: should be indented +1 space inside class Date" [whitespace/indent] [3] # src/sillycode.cpp:15: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:39: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] diff --git a/samples/silly-sample/simple.def b/samples/silly-sample/simple.def index 7bc1dc6..b7ce111 100644 --- a/samples/silly-sample/simple.def +++ b/samples/silly-sample/simple.def @@ -12,7 +12,7 @@ src/sillycode.cpp:2: Should have a space between // and comment [whitespace/co src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] From c2b1ce67ba8f2e9cd02eb1edbea24b59eadba640 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jul 2025 02:17:01 +0000 Subject: [PATCH 17/18] Bump sigstore/gh-action-sigstore-python in the github-actions group Bumps the github-actions group with 1 update: [sigstore/gh-action-sigstore-python](https://github.com/sigstore/gh-action-sigstore-python). Updates `sigstore/gh-action-sigstore-python` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/sigstore/gh-action-sigstore-python/releases) - [Changelog](https://github.com/sigstore/gh-action-sigstore-python/blob/main/CHANGELOG.md) - [Commits](https://github.com/sigstore/gh-action-sigstore-python/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: sigstore/gh-action-sigstore-python dependency-version: 3.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index edf2366..5e79bcd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: name: python-package-distributions path: dist/ - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v3.0.0 + uses: sigstore/gh-action-sigstore-python@v3.0.1 with: inputs: >- ./dist/*.tar.gz From 2eef70dadc16b5e9578931f26e6ad9da23a7b400 Mon Sep 17 00:00:00 2001 From: Geoffrey Viola Date: Fri, 18 Jul 2025 14:45:51 -0400 Subject: [PATCH 18/18] Allow specifying _third_party_headers_pattern (#388) --- cpplint.py | 41 +++++++++++++++++++++++++---------- cpplint_clitest.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/cpplint.py b/cpplint.py index 24897da..ad942ba 100755 --- a/cpplint.py +++ b/cpplint.py @@ -68,7 +68,7 @@ [--filter=-x,+y,...] [--counting=total|toplevel|detailed] [--root=subdir] [--repository=path] - [--linelength=digits] [--headers=x,y,...] + [--linelength=digits] [--headers=x,y,...] [--third_party_headers=pattern] [--recursive] [--exclude=path] [--extensions=hpp,cpp,...] @@ -240,6 +240,8 @@ The header extensions that cpplint will treat as .h in checks. Values are automatically added to --extensions list. (by default, only files with extensions %s will be assumed to be headers) + third_party_headers=pattern + Regex for identifying third-party headers to exclude from include checks. Examples: --headers=%s @@ -256,6 +258,7 @@ linelength=80 root=subdir headers=x,y,... + third_party_headers=pattern "set noparent" option prevents cpplint from traversing directory tree upwards looking for more .cfg files in parent directories. This option @@ -812,14 +815,6 @@ r")$" ) - -# These headers are excluded from [build/include] and [build/include_order] -# checks: -# - Anything not following google file name conventions (containing an -# uppercase character, such as Python.h or nsStringAPI.h, for example). -# - Lua headers. -_THIRD_PARTY_HEADERS_PATTERN = re.compile(r"^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$") - # Pattern for matching FileInfo.BaseName() against test file name _test_suffixes = ["_test", "_regtest", "_unittest"] _TEST_FILE_SUFFIX = "(" + "|".join(_test_suffixes) + r")$" @@ -981,6 +976,16 @@ # This is set by --headers flag. _hpp_headers: set[str] = set() +# These headers are excluded from [build/include_subdir], [build/include_order], and +# [build/include_alpha] +# The default checks are following +# - Anything not following google file name conventions (containing an +# uppercase character, such as Python.h or nsStringAPI.h, for example). +# - Lua headers. +# Default pattern for third-party headers (uppercase .h or Lua headers). +_THIRD_PARTY_HEADERS_DEFAULT = r"^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$" +_third_party_headers_pattern = re.compile(_THIRD_PARTY_HEADERS_DEFAULT) + class ErrorSuppressions: """Class to track all error suppressions for cpplint""" @@ -1072,6 +1077,15 @@ def ProcessIncludeOrderOption(val): PrintUsage("Invalid includeorder value %s. Expected default|standardcfirst") +def ProcessThirdPartyHeadersOption(val): + """Sets the regex pattern for third-party headers.""" + global _third_party_headers_pattern + try: + _third_party_headers_pattern = re.compile(val) + except re.error: + PrintUsage(f"Invalid third_party_headers pattern: {val}") + + def IsHeaderExtension(file_extension): return file_extension in GetHeaderExtensions() @@ -5744,7 +5758,7 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): if ( match and IsHeaderExtension(match.group(2)) - and not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1)) + and not _third_party_headers_pattern.match(match.group(1)) ): error( filename, @@ -5797,7 +5811,7 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): third_src_header = True break - if third_src_header or not _THIRD_PARTY_HEADERS_PATTERN.match(include): + if third_src_header or not _third_party_headers_pattern.match(include): include_state.include_list[-1].append((include, linenum)) # We want to ensure that headers appear in the right order: @@ -7527,6 +7541,8 @@ def ProcessConfigOverrides(filename): _root = os.path.join(os.path.dirname(cfg_file), val) elif name == "headers": ProcessHppHeadersOption(val) + elif name == "third_party_headers": + ProcessThirdPartyHeadersOption(val) elif name == "includeorder": ProcessIncludeOrderOption(val) else: @@ -7711,6 +7727,7 @@ def ParseArguments(args): "exclude=", "recursive", "headers=", + "third_party_headers=", "includeorder=", "config=", "quiet", @@ -7770,6 +7787,8 @@ def ParseArguments(args): ProcessExtensionsOption(val) elif opt == "--headers": ProcessHppHeadersOption(val) + elif opt == "--third_party_headers": + ProcessThirdPartyHeadersOption(val) elif opt == "--recursive": recursive = True elif opt == "--includeorder": diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 7cb2047..165e192 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -37,6 +37,7 @@ import subprocess import sys import tempfile +import textwrap import pytest from testfixtures import compare # type: ignore[import-untyped] @@ -224,5 +225,57 @@ def test_codelite_sample(self): self.check_all_in_folder("./samples/codelite-sample", 1) +# Tests for third_party_headers option +def test_third_party_headers_default(tmp_path): + # By default, headers with uppercase letters are treated as third-party and not flagged + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + int main() { return 0; } + """) + ) + status, out, err = run_shell_command(BASE_CMD, f"{cpp.name}", cwd=str(tmp_path)) + assert status == 0, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + # No include_subdir warning + assert b"build/include_subdir" not in err + + +def test_third_party_headers_override(tmp_path): + # Override third_party_headers so Foo.h is not recognized as third-party + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + """) + ) + # Use a pattern that matches nothing + flag = "--third_party_headers=^Bar.h$" + status, out, err = run_shell_command(BASE_CMD, f"{flag} {cpp.name}", cwd=str(tmp_path)) + # Expect a warning about include_subdir + assert status == 1, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + assert b"build/include_subdir" in err + + +def test_third_party_headers_config(tmp_path): + # Override third_party_headers via config file so Foo.h is not recognized as third-party + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + """) + ) + # Write configuration file to override third_party_headers + config = tmp_path / "CPPLINT.cfg" + config.write_text("third_party_headers=^Bar.h$\n") + status, out, err = run_shell_command(BASE_CMD, f"{cpp.name}", cwd=str(tmp_path)) + # Expect a warning about include_subdir due to override + assert status == 1, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + assert b"build/include_subdir" in err + + if __name__ == "__main__": pytest.main([__file__])