summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2009-08-06 21:21:21 +0000
committerJohn McCall <rjmccall@apple.com>2009-08-06 21:21:21 +0000
commit2c5206d22ef955e10e43ab7a1e94bb6f5b0fd13e (patch)
treef024f3869b4b42035b4767164d57e80012289bbb /clang/lib/Sema
parent1e455c0f3bf789fe6db08fafd54dead214cfe396 (diff)
downloadbcm5719-llvm-2c5206d22ef955e10e43ab7a1e94bb6f5b0fd13e.tar.gz
bcm5719-llvm-2c5206d22ef955e10e43ab7a1e94bb6f5b0fd13e.zip
Drop the friend-inner-class diagnostic from an extwarn to an ext and don't
guard its report on GNUMode. llvm-svn: 78338
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 63b0b3d83d7..20862d4c81f 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -3371,8 +3371,8 @@ Sema::DeclPtrTy Sema::ActOnFriendDecl(Scope *S,
// 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);
}
OpenPOWER on IntegriCloud