Skip to content

Commit b9f0b0e

Browse files
committed
clang-format
1 parent 1d59298 commit b9f0b0e

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

clang/include/clang/Sema/Initialization.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,9 +1402,7 @@ class InitializationSequence {
14021402

14031403
/// Retrieve a reference to the candidate set when overload
14041404
/// resolution fails.
1405-
OverloadCandidateSet &getFailedCandidateSet() {
1406-
return FailedCandidateSet;
1407-
}
1405+
OverloadCandidateSet &getFailedCandidateSet() { return FailedCandidateSet; }
14081406

14091407
/// Get the overloading result, for when the initialization
14101408
/// sequence failed due to a bad overload.

clang/include/clang/Sema/Overload.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,8 @@ class Sema;
972972
private:
973973
friend class OverloadCandidateSet;
974974
OverloadCandidate()
975-
: IsSurrogate(false), IsADLCandidate(CallExpr::NotADL), RewriteKind(CRK_None) {}
975+
: IsSurrogate(false), IsADLCandidate(CallExpr::NotADL),
976+
RewriteKind(CRK_None) {}
976977
};
977978

978979
/// OverloadCandidateSet - A set of overload candidates, used in C++
@@ -1095,8 +1096,7 @@ class Sema;
10951096
/// instead.
10961097
/// FIXME: Now that this only allocates ImplicitConversionSequences, do we
10971098
/// want to un-generalize this?
1098-
template <typename T>
1099-
T *slabAllocate(unsigned N) {
1099+
template <typename T> T *slabAllocate(unsigned N) {
11001100
// It's simpler if this doesn't need to consider alignment.
11011101
static_assert(alignof(T) == alignof(void *),
11021102
"Only works for pointer-aligned types.");

clang/lib/Sema/SemaInit.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9749,7 +9749,8 @@ bool InitializationSequence::Diagnose(Sema &S,
97499749
break;
97509750

97519751
case OR_No_Viable_Function: {
9752-
auto Cands = FailedCandidateSet.CompleteCandidates(S, OCD_AllCandidates, Args);
9752+
auto Cands =
9753+
FailedCandidateSet.CompleteCandidates(S, OCD_AllCandidates, Args);
97539754
if (!S.RequireCompleteType(Kind.getLocation(),
97549755
DestType.getNonReferenceType(),
97559756
diag::err_typecheck_nonviable_condition_incomplete,
@@ -9764,8 +9765,8 @@ bool InitializationSequence::Diagnose(Sema &S,
97649765
}
97659766
case OR_Deleted: {
97669767
OverloadCandidateSet::iterator Best;
9767-
OverloadingResult Ovl
9768-
= FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
9768+
OverloadingResult Ovl =
9769+
FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
97699770

97709771
StringLiteral *Msg = Best->Function->getDeletedMessage();
97719772
S.Diag(Kind.getLocation(), diag::err_typecheck_deleted_function)
@@ -10013,8 +10014,8 @@ bool InitializationSequence::Diagnose(Sema &S,
1001310014

1001410015
case OR_Deleted: {
1001510016
OverloadCandidateSet::iterator Best;
10016-
OverloadingResult Ovl
10017-
= FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
10017+
OverloadingResult Ovl =
10018+
FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
1001810019
if (Ovl != OR_Deleted) {
1001910020
S.Diag(Kind.getLocation(), diag::err_ovl_deleted_init)
1002010021
<< DestType << ArgsRange;
@@ -10093,8 +10094,8 @@ bool InitializationSequence::Diagnose(Sema &S,
1009310094
S.Diag(Kind.getLocation(), diag::err_selected_explicit_constructor)
1009410095
<< Args[0]->getSourceRange();
1009510096
OverloadCandidateSet::iterator Best;
10096-
OverloadingResult Ovl
10097-
= FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
10097+
OverloadingResult Ovl =
10098+
FailedCandidateSet.BestViableFunction(S, Kind.getLocation(), Best);
1009810099
(void)Ovl;
1009910100
assert(Ovl == OR_Success && "Inconsistent overload resolution");
1010010101
CXXConstructorDecl *CtorDecl = cast<CXXConstructorDecl>(Best->Function);

0 commit comments

Comments
 (0)