diff options
author | Nico Weber <nicolasweber@gmx.de> | 2016-01-22 21:13:04 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2016-01-22 21:13:04 +0000 |
commit | 7849ad0f7282096c22a5b408fd9f5cfa4727d49c (patch) | |
tree | 29d71c82e0b03b8cda74abf73aba3ea975d69177 | |
parent | 3388d1fc6d990ac26dfc9bb6510fb5419a9a22af (diff) | |
download | bcm5719-llvm-7849ad0f7282096c22a5b408fd9f5cfa4727d49c.tar.gz bcm5719-llvm-7849ad0f7282096c22a5b408fd9f5cfa4727d49c.zip |
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'
llvm-svn: 258553
-rw-r--r-- | llvm/include/llvm/Support/AlignOf.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/include/llvm/Support/AlignOf.h b/llvm/include/llvm/Support/AlignOf.h index 5268c8d1698..e6a61aec851 100644 --- a/llvm/include/llvm/Support/AlignOf.h +++ b/llvm/include/llvm/Support/AlignOf.h @@ -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, + T6, T7, T8, T9, T10> >::Alignment, + sizeof(::llvm::detail::SizerImpl<T1, T2, T3, T4, T5, + T6, T7, T8, T9, T10>)> { }; } // end namespace llvm #endif |