update .clang-format
generated by version 3.8.1 local changes from --style=Google 3a4 > # Generated with clang-format 3.8.1 10c11 < AlignTrailingComments: true --- > AlignTrailingComments: false 15,16c16,17 < AllowShortIfStatementsOnASingleLine: true < AllowShortLoopsOnASingleLine: true --- > AllowShortIfStatementsOnASingleLine: false > AllowShortLoopsOnASingleLine: false 37c38 < BreakBeforeTernaryOperators: true --- > BreakBeforeTernaryOperators: false Change-Id: I4ded7e36fb8bd5407cfba6d1c4f86e0bec620c0c
This commit is contained in:
@@ -60,7 +60,7 @@ class Ancestory {
|
||||
// Constructs an Ancestory using the first count elements of ancestory.
|
||||
// ancestory must have static storage duration.
|
||||
template <std::size_t N>
|
||||
Ancestory(const Id(&ancestory)[N], std::size_t count)
|
||||
Ancestory(const Id (&ancestory)[N], std::size_t count)
|
||||
: begin_(ancestory), end_(ancestory + count) {
|
||||
assert(count <= N);
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ class MasterValueParser : public ElementParser {
|
||||
// If called, OnParseStarted will be called on the parent element when this
|
||||
// particular element is encountered.
|
||||
constexpr SingleChildFactory<Parser, Value, TagUseAsStart, Tags...>
|
||||
UseAsStartEvent() const {
|
||||
UseAsStartEvent() const {
|
||||
return {id_, member_};
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@ class MasterValueParser : public ElementParser {
|
||||
// particular element is fully parsed.
|
||||
constexpr SingleChildFactory<Parser, Value, TagNotifyOnParseComplete,
|
||||
Tags...>
|
||||
NotifyOnParseComplete() const {
|
||||
NotifyOnParseComplete() const {
|
||||
return {id_, member_};
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ class MasterValueParser : public ElementParser {
|
||||
// If called, OnParseStarted will be called on the parent element when this
|
||||
// particular element is encountered.
|
||||
constexpr RepeatedChildFactory<Parser, Value, TagUseAsStart, Tags...>
|
||||
UseAsStartEvent() const {
|
||||
UseAsStartEvent() const {
|
||||
return {id_, member_};
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ class MasterValueParser : public ElementParser {
|
||||
// particular element is fully parsed.
|
||||
constexpr RepeatedChildFactory<Parser, Value, TagNotifyOnParseComplete,
|
||||
Tags...>
|
||||
NotifyOnParseComplete() const {
|
||||
NotifyOnParseComplete() const {
|
||||
return {id_, member_};
|
||||
}
|
||||
|
||||
@@ -423,7 +423,7 @@ class MasterValueParser : public ElementParser {
|
||||
template <typename Parser, typename Value, typename... Tags, typename F>
|
||||
static typename std::enable_if<!std::is_constructible<Parser, Value>::value,
|
||||
std::unique_ptr<ElementParser>>::type
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value, ...) {
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value, ...) {
|
||||
return std::unique_ptr<ElementParser>(new ChildParser<Parser, F, Tags...>(
|
||||
parent, std::move(consume_element_value)));
|
||||
}
|
||||
@@ -433,8 +433,8 @@ class MasterValueParser : public ElementParser {
|
||||
template <typename Parser, typename Value, typename... Tags, typename F>
|
||||
static typename std::enable_if<std::is_constructible<Parser, Value>::value,
|
||||
std::unique_ptr<ElementParser>>::type
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value,
|
||||
const Element<Value>* default_value) {
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value,
|
||||
const Element<Value>* default_value) {
|
||||
return std::unique_ptr<ElementParser>(new ChildParser<Parser, F, Tags...>(
|
||||
parent, std::move(consume_element_value), default_value->value()));
|
||||
}
|
||||
@@ -444,8 +444,8 @@ class MasterValueParser : public ElementParser {
|
||||
template <typename Parser, typename Value, typename... Tags, typename F>
|
||||
static typename std::enable_if<std::is_constructible<Parser, Value>::value,
|
||||
std::unique_ptr<ElementParser>>::type
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value,
|
||||
const std::vector<Element<Value>>* member) {
|
||||
MakeChildParser(MasterValueParser* parent, F consume_element_value,
|
||||
const std::vector<Element<Value>>* member) {
|
||||
Value default_value{};
|
||||
if (!member->empty()) {
|
||||
default_value = member->front().value();
|
||||
|
||||
Reference in New Issue
Block a user