Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

vs2015_build_fixes #7

Merged
merged 1 commit into from
Jan 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/clang/ASTMatchers/ASTMatchersInternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,10 @@ bool matchesFirstInPointerRange(const MatcherT &Matcher, IteratorT Start,

// Metafunction to determine if type T has a member called
// getDecl.
#if defined(_MSC_VER) && (_MSC_VER < 1900) && !defined(__clang__)
// For old versions of MSVC, we use a weird nonstandard __if_exists
// statement, since before MSVC2015, it was not standards-conformant
// enough to compile the usual code below.
#if defined(_MSC_VER) && !defined(__clang__)
// For MSVC, we use a weird nonstandard __if_exists statement, as it
// is not standards-conformant enough to properly compile the standard
// code below. (At least up through MSVC 2015 require this workaround)
template <typename T> struct has_getDecl {
__if_exists(T::getDecl) {
enum { value = 1 };
Expand Down
5 changes: 5 additions & 0 deletions unittests/ASTMatchers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ set(LLVM_LINK_COMPONENTS
add_clang_unittest(ASTMatchersTests
ASTMatchersTest.cpp)

# XXX Emscripten: Hotfix for bug https://llvm.org/bugs/show_bug.cgi?id=26089
if (MSVC)
set_source_files_properties(ASTMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj)
endif()

target_link_libraries(ASTMatchersTests
clangAST
clangASTMatchers
Expand Down
5 changes: 5 additions & 0 deletions unittests/Tooling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ add_clang_unittest(ToolingTests
ReplacementsYamlTest.cpp
)

# XXX Emscripten: Hotfix for bug https://llvm.org/bugs/show_bug.cgi?id=26089
if (MSVC)
set_source_files_properties(RecursiveASTVisitorTestExprVisitor.cpp PROPERTIES COMPILE_FLAGS /bigobj)
endif()

target_link_libraries(ToolingTests
clangAST
clangASTMatchers
Expand Down