summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDmitry Polukhin <dmitry.polukhin@gmail.com>2016-04-28 09:56:22 +0000
committerDmitry Polukhin <dmitry.polukhin@gmail.com>2016-04-28 09:56:22 +0000
commit5b4faeec8705aeecd9c7d5cb90ece6f50c459195 (patch)
tree2201cd12d0bde9c0ade2381842755cef63fab7c4 /clang/lib
parentdc7b607b09460ba85890c2c4af0f7ee43c2bc4cd (diff)
downloadbcm5719-llvm-5b4faeec8705aeecd9c7d5cb90ece6f50c459195.tar.gz
bcm5719-llvm-5b4faeec8705aeecd9c7d5cb90ece6f50c459195.zip
Revert "[MSVC] PR27337: allow static_cast from private base to derived for WTL"
This reverts commit r267534. llvm-svn: 267865
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaCast.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaCast.cpp b/clang/lib/Sema/SemaCast.cpp
index 84a070573f5..4a7699b22e2 100644
--- a/clang/lib/Sema/SemaCast.cpp
+++ b/clang/lib/Sema/SemaCast.cpp
@@ -1344,11 +1344,10 @@ TryStaticDowncast(Sema &Self, CanQualType SrcType, CanQualType DestType,
}
if (!CStyle) {
- unsigned Diag = Self.getLangOpts().MSVCCompat
- ? diag::ext_ms_downcast_from_inaccessible_base
- : diag::err_downcast_from_inaccessible_base;
- switch (Self.CheckBaseClassAccess(OpRange.getBegin(), SrcType, DestType,
- Paths.front(), Diag)) {
+ switch (Self.CheckBaseClassAccess(OpRange.getBegin(),
+ SrcType, DestType,
+ Paths.front(),
+ diag::err_downcast_from_inaccessible_base)) {
case Sema::AR_accessible:
case Sema::AR_delayed: // be optimistic
case Sema::AR_dependent: // be optimistic
OpenPOWER on IntegriCloud