Skip to content

Commit

Permalink
Wrap include of <future> in some warning suppression pragmas
Browse files Browse the repository at this point in the history
Eventually we may need to sink this include to the .cpp file or
something to suport LLVM_ENABLE_THREADS=OFF, but this solves my
immediate problem of fixing the build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255682 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
rnk committed Dec 15, 2015
1 parent 3768c07 commit 2f080af
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion include/llvm/Support/ThreadPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,21 @@
// concrt.h depends on eh.h for __uncaught_exception declaration
// even if we disable exceptions.
#include <eh.h>

// Disable warnings from ppltasks.h transitively included by <future>.
#pragma warning(push)
#pragma warning(disable:4530)
#pragma warning(disable:4062)
#endif

#include <future>

#ifdef _MSC_VER
#pragma warning(pop)
#endif

#include <condition_variable>
#include <functional>
#include <future>
#include <memory>
#include <mutex>
#include <queue>
Expand Down

0 comments on commit 2f080af

Please sign in to comment.