[llvm] r258553 - Make InstProfWriter compile again after 258544 with MSVC.

[Adrian Prantl via llvm-commits]

> On Jan 22, 2016, at 1:13 PM, Nico Weber via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: nico
> Date: Fri Jan 22 15:13:04 2016
> New Revision: 258553
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=258553&view=rev
> Log:
> Make InstProfWriter compile again after 258544 with MSVC.
> 
> \src\llvm-rw\include\llvm/Support/AlignOf.h(254) :
>    error C2872: 'detail' : ambiguous symbol
>        could be 'llvm::detail'
>        or       'llvm::support::detail'
> 
> Modified:
>    llvm/trunk/include/llvm/Support/AlignOf.h
> 
> Modified: llvm/trunk/include/llvm/Support/AlignOf.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AlignOf.h?rev=258553&r1=258552&r2=258553&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/AlignOf.h (original)
> +++ llvm/trunk/include/llvm/Support/AlignOf.h Fri Jan 22 15:13:04 2016
> @@ -79,8 +79,8 @@ struct AlignOf {
>       sizeof(detail::AlignmentCalcImpl<T>) - sizeof(T));
> #else
>   enum {
> -    Alignment = static_cast<unsigned int>(sizeof(detail::AlignmentCalcImpl<T>) -
> -                                          sizeof(T))
> +    Alignment = static_cast<unsigned int>(
> +        sizeof(::llvm::detail::AlignmentCalcImpl<T>) - sizeof(T))
>   };
> #endif
>   enum { Alignment_GreaterEqual_2Bytes = Alignment >= 2 ? 1 : 0 };
> @@ -249,10 +249,10 @@ template <typename T1,
>           typename T5 = char, typename T6 = char, typename T7 = char,
>           typename T8 = char, typename T9 = char, typename T10 = char>
> struct AlignedCharArrayUnion : llvm::AlignedCharArray<
> -    AlignOf<detail::AlignerImpl<T1, T2, T3, T4, T5,
> -                                T6, T7, T8, T9, T10> >::Alignment,
> -    sizeof(detail::SizerImpl<T1, T2, T3, T4, T5,
> -                             T6, T7, T8, T9, T10>)> {
> +    AlignOf<::llvm::detail::AlignerImpl<T1, T2, T3, T4, T5,
             ^^^ Trigraph alert :-)


> +                                        T6, T7, T8, T9, T10> >::Alignment,
> +    sizeof(::llvm::detail::SizerImpl<T1, T2, T3, T4, T5,
> +                                     T6, T7, T8, T9, T10>)> {
> };
> } // end namespace llvm
> #endif
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits