Skip to content

Commit 6b85331

Browse files
committed
[NFC][Clang] Fix enumerated mismatch warning
This is one of the many PRs to fix errors with LLVM_ENABLE_WERROR=on. Built by GCC 11. Fix warning: llvm-project/clang/lib/Parse/ParseDeclCXX.cpp:3153:14: error: enumerated mismatch in conditional expression: ‘clang::diag::<unnamed enum>’ vs ‘clang::diag::<unnamed enum>’ [-Werror=enum-compare] 3152 | DS.isFriendSpecified() || NextToken().is(tok::kw_friend) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 3153 | ? diag::err_friend_concept | ^~~~~~~~~~~~~~~~~~~~~~~~~~ 3154 | : diag:: | ~~~~~~~~ 3155 | err_concept_decls_may_only_appear_in_global_namespace_scope);
1 parent 5785cbb commit 6b85331

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

clang/include/clang/Basic/DiagnosticParseKinds.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,6 @@ def warn_cxx23_variadic_friends : Warning<
983983
"variadic 'friend' declarations are incompatible with C++ standards before C++2c">,
984984
DefaultIgnore, InGroup<CXXPre26Compat>;
985985

986-
def err_friend_concept : Error<
987-
"friend declaration cannot be a concept">;
988-
989986
// C++11 default member initialization
990987
def ext_nonstatic_member_init : ExtWarn<
991988
"default member initializer for non-static data member is a C++11 "

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,6 +3020,8 @@ def err_c23_constexpr_pointer_not_null : Error<
30203020
"constexpr pointer initializer is not null">;
30213021

30223022
// C++ Concepts
3023+
def err_friend_concept : Error<
3024+
"friend declaration cannot be a concept">;
30233025
def err_concept_decls_may_only_appear_in_global_namespace_scope : Error<
30243026
"concept declarations may only appear in global or namespace scope">;
30253027
def err_concept_no_parameters : Error<

0 commit comments

Comments
 (0)