diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-06-22 16:43:02 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-06-22 16:43:02 -0700 |
commit | a29a2cb4ff4eb153d8e725f126f178371cc0468c (patch) | |
tree | 8d0ec499274410ce7db94daca19fc80264ba8603 /unsupported | |
parent | f8fcd6b32d6b1a3613330e553bb3bc52a0007192 (diff) |
Silenced a couple of compilation warnings generated by xcode
Diffstat (limited to 'unsupported')
-rw-r--r-- | unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h index 8d4973ded..c6db01a6b 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h +++ b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h @@ -99,7 +99,7 @@ class NonBlockingThreadPoolTempl : public Eigen::ThreadPoolInterface { typedef typename Environment::EnvThread Thread; struct PerThread { - PerThread() : pool(NULL), index(-1), rand(0) { } + constexpr PerThread() : pool(NULL), index(-1), rand(0) { } NonBlockingThreadPoolTempl* pool; // Parent pool, or null for normal threads. unsigned index; // Worker thread index in pool. uint64_t rand; // Random generator state. @@ -247,7 +247,7 @@ class NonBlockingThreadPoolTempl : public Eigen::ThreadPoolInterface { // Update the internal state *state = current * 6364136223846793005ULL + 0xda3e39cb94b95bdbULL; // Generate the random output (using the PCG-XSH-RS scheme) - return (current ^ (current >> 22)) >> (22 + (current >> 61)); + return static_cast<unsigned>((current ^ (current >> 22)) >> (22 + (current >> 61))); } }; |