<p dir="ltr">On 7 Jul 2015 5:53 am, "Aaron Ballman" <<a href="mailto:aaron@aaronballman.com">aaron@aaronballman.com</a>> wrote:<br>
><br>
> Author: aaronballman<br>
> Date: Tue Jul  7 07:50:30 2015<br>
> New Revision: 241577<br>
><br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D241577-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=WroQ8wIJgfFtAWQPq7WjnRDRcS6OXkm7PAWVK5kR5NU&s=_DXJUhVvcWsFgeQ57yJKg2NAjiWa93GH3QJXQTrlDm4&e=">http://llvm.org/viewvc/llvm-project?rev=241577&view=rev</a><br>
> Log:<br>
> Changing a use of alignof() into llvm::alignOf() for MSVC compatibility. This requires changing a static_assert into an assert, too.</p>
<p dir="ltr">You can use AlignOf instead of alignOf to keep the assert static.</p>
<p dir="ltr">> Modified:<br>
>     cfe/trunk/lib/AST/DeclObjC.cpp<br>
><br>
> Modified: cfe/trunk/lib/AST/DeclObjC.cpp<br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_lib_AST_DeclObjC.cpp-3Frev-3D241577-26r1-3D241576-26r2-3D241577-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=WroQ8wIJgfFtAWQPq7WjnRDRcS6OXkm7PAWVK5kR5NU&s=VdWvNneR7sVqc-Kihcn_gfM1Q8t5mXhvjhcNVEQOnjg&e=">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclObjC.cpp?rev=241577&r1=241576&r2=241577&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/AST/DeclObjC.cpp (original)<br>
> +++ cfe/trunk/lib/AST/DeclObjC.cpp Tue Jul  7 07:50:30 2015<br>
> @@ -1266,8 +1266,9 @@ ObjCTypeParamList *ObjCTypeParamList::cr<br>
>                       SourceLocation rAngleLoc) {<br>
>    unsigned size = sizeof(ObjCTypeParamList)<br>
>                  + sizeof(ObjCTypeParamDecl *) * typeParams.size();<br>
> -  static_assert(alignof(ObjCTypeParamList) >= alignof(ObjCTypeParamDecl*),<br>
> -                "type parameter list needs greater alignment");<br>
> +  assert(llvm::alignOf<ObjCTypeParamList>() >=<br>
> +             llvm::alignOf<ObjCTypeParamDecl *>() &&<br>
> +         "type parameter list needs greater alignment");<br>
>    unsigned align = llvm::alignOf<ObjCTypeParamList>();<br>
>    void *mem = ctx.Allocate(size, align);<br>
>    return new (mem) ObjCTypeParamList(lAngleLoc, typeParams, rAngleLoc);<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</p>