r339387 - Revert -r339382, which apparently breaks the Windows build.

[Keane, Erich via cfe-commits]

AH! Thanks!  I was just messing around on Godbolt to try to figure out what was going on.

From: Richard Smith [mailto:richard at metafoo.co.uk]
Sent: Thursday, August 9, 2018 2:16 PM
To: Keane, Erich <erich.keane at intel.com>
Cc: cfe-commits <cfe-commits at lists.llvm.org>
Subject: Re: r339387 - Revert -r339382, which apparently breaks the Windows build.

On Thu, 9 Aug 2018 at 14:14, Erich Keane via cfe-commits <cfe-commits at lists.llvm.org<mailto:cfe-commits at lists.llvm.org>> wrote:
Author: erichkeane
Date: Thu Aug  9 14:13:46 2018
New Revision: 339387

URL: http://llvm.org/viewvc/llvm-project?rev=339387&view=rev
Log:
Revert -r339382, which apparently breaks the Windows build.

Modified:
    cfe/trunk/include/clang/Sema/ParsedAttr.h

Modified: cfe/trunk/include/clang/Sema/ParsedAttr.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/ParsedAttr.h?rev=339387&r1=339386&r2=339387&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/ParsedAttr.h (original)
+++ cfe/trunk/include/clang/Sema/ParsedAttr.h Thu Aug  9 14:13:46 2018
@@ -118,7 +118,9 @@ class ParsedAttr final
     : private llvm::TrailingObjects<
           ParsedAttr, ArgsUnion, detail::AvailabilityData,
           detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData> {
-  friend class TrailingObjects;
+  friend class llvm::TrailingObjects<
+      ParsedAttr, ArgsUnion, detail::AvailabilityData,
+      detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData>;

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).

   size_t numTrailingObjects(OverloadToken<ArgsUnion>) const { return NumArgs; }
   size_t numTrailingObjects(OverloadToken<detail::AvailabilityData>) const {


_______________________________________________
cfe-commits mailing list
cfe-commits at lists.llvm.org<mailto:cfe-commits at lists.llvm.org>
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180809/f4d87273/attachment-0001.html>