diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-24 15:19:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-24 15:19:11 +0400 |
| commit | 4ac88bd16f3dfd9b3e338775a9eeb512b526b60a (patch) | |
| tree | 0a1bdb5c4642a0ab7a3b360f542836c7e15326e9 /intern/container | |
| parent | 3e62e518ec2d7e41658451d8c37692e31c20523c (diff) | |
Fix for mingw 64bit fix.
Diffstat (limited to 'intern/container')
| -rw-r--r-- | intern/container/CTR_TaggedIndex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index f48d492c28a..b5284a5da30 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -102,9 +102,9 @@ public: #if defined(_WIN64) CTR_TaggedIndex( - const unsigned int64_t val + const uint64_t val ) : - m_val ( ((unsigned int64_t)val & index_mask) + m_val ( ((uint64_t)val & index_mask) | ( (empty_tag << tag_shift) & (~index_mask) ) ) { } @@ -142,8 +142,8 @@ public: } #if defined(_WIN64) - operator unsigned int64_t () const { - return (unsigned int64_t)(m_val & index_mask); + operator uint64_t () const { + return (uint64_t)(m_val & index_mask); } #endif |