Skip to content

Commit adc34b5

Browse files
committed
Fixes
1 parent 53a647b commit adc34b5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

clang/lib/Sema/SemaTemplate.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3212,7 +3212,8 @@ void Sema::NoteAllFoundTemplates(TemplateName Name) {
32123212
}
32133213
}
32143214

3215-
static QualType InstantiateTemplate(Sema &S, ElaboratedTypeKeyword Keyword, TemplateName Template,
3215+
static QualType InstantiateTemplate(Sema &S, ElaboratedTypeKeyword Keyword,
3216+
TemplateName Template,
32163217
ArrayRef<TemplateArgument> Args,
32173218
SourceLocation Loc) {
32183219
TemplateArgumentListInfo ArgList;

libcxx/include/__type_traits/common_reference.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ template <class _Tp, class _Up, template <class> class _Tx, template <class> cla
4444
using __basic_common_reference_t = basic_common_reference<_Tp, _Up, _Tx, _Ux>::type;
4545

4646
template <class... _Args>
47-
struct common_reference
47+
struct _LIBCPP_NO_SPECIALIZATIONS common_reference
4848
: __builtin_common_reference<__basic_common_reference_t, common_type_t, type_identity, __empty, _Args...> {};
4949

5050
# else
@@ -131,9 +131,9 @@ struct __common_ref {};
131131
// Note C: For the common_reference trait applied to a parameter pack [...]
132132

133133
_LIBCPP_DIAGNOSTIC_PUSH
134-
# if __has_warning("-Winvalid-specialization")
134+
# if __has_warning("-Winvalid-specialization")
135135
_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Winvalid-specialization")
136-
# endif
136+
# endif
137137
// bullet 1 - sizeof...(T) == 0
138138
template <>
139139
struct common_reference<> {};

0 commit comments

Comments
 (0)