maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Nico Weber 2016-01-22 21:13:04 +00:00
parent 3388d1fc6d
commit 7849ad0f72
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/Support/AlignOf.h
View File

@ -79,8 +79,8 @@ struct AlignOf {
sizeof(detail::AlignmentCalcImpl<T>) - sizeof(T)); sizeof(detail::AlignmentCalcImpl<T>) - sizeof(T));
#else #else
enum { enum {
Alignment = static_cast<unsigned int>(sizeof(detail::AlignmentCalcImpl<T>) - Alignment = static_cast<unsigned int>(
sizeof(T)) sizeof(::llvm::detail::AlignmentCalcImpl<T>) - sizeof(T))
}; };
#endif #endif
enum { Alignment_GreaterEqual_2Bytes = Alignment >= 2 ? 1 : 0 }; 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 T5 = char, typename T6 = char, typename T7 = char,
typename T8 = char, typename T9 = char, typename T10 = char> typename T8 = char, typename T9 = char, typename T10 = char>
struct AlignedCharArrayUnion : llvm::AlignedCharArray< struct AlignedCharArrayUnion : llvm::AlignedCharArray<
AlignOf<detail::AlignerImpl<T1, T2, T3, T4, T5, AlignOf<::llvm::detail::AlignerImpl<T1, T2, T3, T4, T5,
T6, T7, T8, T9, T10> >::Alignment, T6, T7, T8, T9, T10> >::Alignment,
sizeof(detail::SizerImpl<T1, T2, T3, T4, T5, sizeof(::llvm::detail::SizerImpl<T1, T2, T3, T4, T5,
T6, T7, T8, T9, T10>)> { T6, T7, T8, T9, T10>)> {
}; };
} // end namespace llvm } // end namespace llvm
#endif #endif