Drop the friend-inner-class diagnostic from an extwarn to an ext and don't
guard its report on GNUMode.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78338 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 63b0b3d..20862d4 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -3371,8 +3371,8 @@
// Also, definitions currently get treated in a way that causes
// this error, so only report it if we didn't see a definition.
else if (RD->getDeclContext() == CurContext &&
- !(getLangOptions().CPlusPlus0x || getLangOptions().GNUMode))
- Diag(DS.getFriendSpecLoc(), diag::extwarn_friend_inner_class);
+ !getLangOptions().CPlusPlus0x)
+ Diag(DS.getFriendSpecLoc(), diag::ext_friend_inner_class);
return DeclPtrTy::make(RD);
}