summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErich Keane <erich.keane@intel.com>2018-08-09 21:18:13 +0000
committerErich Keane <erich.keane@intel.com>2018-08-09 21:18:13 +0000
commit7f796c787f8d0c394fd7d56add07deb0faf46b9f (patch)
treeadbd84061084cca5c1aecea26c9475f3eafcc59e
parent7d7943313641459fb70a80f8d0bde09a791987b9 (diff)
downloadbcm5719-llvm-7f796c787f8d0c394fd7d56add07deb0faf46b9f.tar.gz
bcm5719-llvm-7f796c787f8d0c394fd7d56add07deb0faf46b9f.zip
Fix and recommit r339382 based on solution from RSmith:
As sent on cfe-commits: "You need to use "friend TrailingObjects;" here, not "friend class TrailingObjects;", to avoid breaking MSVC (which doesn't implement injected-class-names quite according to spec)." llvm-svn: 339389
-rw-r--r--clang/include/clang/Sema/ParsedAttr.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/include/clang/Sema/ParsedAttr.h b/clang/include/clang/Sema/ParsedAttr.h
index 1c7d001f036..34eb59eb433 100644
--- a/clang/include/clang/Sema/ParsedAttr.h
+++ b/clang/include/clang/Sema/ParsedAttr.h
@@ -118,9 +118,7 @@ class ParsedAttr final
: private llvm::TrailingObjects<
ParsedAttr, ArgsUnion, detail::AvailabilityData,
detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData> {
- friend class llvm::TrailingObjects<
- ParsedAttr, ArgsUnion, detail::AvailabilityData,
- detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData>;
+ friend TrailingObjects;
size_t numTrailingObjects(OverloadToken<ArgsUnion>) const { return NumArgs; }
size_t numTrailingObjects(OverloadToken<detail::AvailabilityData>) const {
OpenPOWER on IntegriCloud