]> granicus.if.org Git - llvm/commitdiff
Merging r264335:
authorDimitry Andric <dimitry@andric.com>
Tue, 5 Apr 2016 06:58:21 +0000 (06:58 +0000)
committerDimitry Andric <dimitry@andric.com>
Tue, 5 Apr 2016 06:58:21 +0000 (06:58 +0000)
------------------------------------------------------------------------
r264335 | dim | 2016-03-24 21:39:17 +0100 (Thu, 24 Mar 2016) | 17 lines

Add <atomic> to ThreadPool.h, since std::atomic is used

Summary:
Apparently, when compiling with gcc 5.3.2 for powerpc64, the order of
headers is such that it gets an error about std::atomic<> use in
ThreadPool.h, since this header is not included explicitly.  See also:

https://llvm.org/bugs/show_bug.cgi?id=27058

Fix this by including <atomic>.  Patch by Bryan Drewery.

Reviewers: chandlerc, joker.eph

Subscribers: bdrewery, llvm-commits

Differential Revision: http://reviews.llvm.org/D18460

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@265380 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Support/ThreadPool.h

index 745334db4450cd3c13b57ec7d4d6de18b8e8ae3c..665cec2465bfc083bce9d2e6c0b35ba9d08d2d76 100644 (file)
@@ -33,6 +33,7 @@
 #pragma warning(pop)
 #endif
 
+#include <atomic>
 #include <condition_variable>
 #include <functional>
 #include <memory>