diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-17 10:04:25 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-17 10:04:25 -0800 |
| commit | 36c9d082746cc4f2dc9d0cc3cb1ac55a90ca0db0 (patch) | |
| tree | 5e1e8d2b665f6f083abc32e3dd8d9fb30a2f9667 /unsupported/Eigen/src/SparseExtra/RandomSetter.h | |
| parent | f77054f43c67dfcd0956bc57e63aae54d9eab4e5 (diff) | |
| parent | 97a36ecba446750620c47237e16106f245a422b9 (diff) | |
Pulled latest updates from trunk
Diffstat (limited to 'unsupported/Eigen/src/SparseExtra/RandomSetter.h')
| -rw-r--r-- | unsupported/Eigen/src/SparseExtra/RandomSetter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/SparseExtra/RandomSetter.h b/unsupported/Eigen/src/SparseExtra/RandomSetter.h index 0b71ed3ad..eb3e17330 100644 --- a/unsupported/Eigen/src/SparseExtra/RandomSetter.h +++ b/unsupported/Eigen/src/SparseExtra/RandomSetter.h @@ -296,7 +296,7 @@ class RandomSetter const Index inner = SetterRowMajor ? col : row; const Index outerMajor = outer >> OuterPacketBits; // index of the packet/map const Index outerMinor = outer & OuterPacketMask; // index of the inner vector in the packet - const KeyType key = (KeyType(outerMinor)<<m_keyBitsOffset) | inner; + const KeyType key = internal::convert_index<KeyType>((outerMinor<<m_keyBitsOffset) | inner); return m_hashmaps[outerMajor][key].value; } |