diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-24 15:01:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-24 15:01:39 +0400 |
| commit | 3e62e518ec2d7e41658451d8c37692e31c20523c (patch) | |
| tree | d5c229fd7507b07d85aaf18ace04cd1da8e10a93 /intern/container | |
| parent | 4a989282d44bf578af65e52e7e9d5f3ec3036b2f (diff) | |
Attempt to fix mingw 64 bit compile error.
Diffstat (limited to 'intern/container')
| -rw-r--r-- | intern/container/CTR_TaggedIndex.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 0a57ce11d19..f48d492c28a 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -52,6 +52,8 @@ #include <functional> +#include "MEM_sys_types.h" + enum { empty_tag = 0x0, @@ -100,9 +102,9 @@ public: #if defined(_WIN64) CTR_TaggedIndex( - const unsigned __int64 val + const unsigned int64_t val ) : - m_val ( ((unsigned __int64)val & index_mask) + m_val ( ((unsigned int64_t)val & index_mask) | ( (empty_tag << tag_shift) & (~index_mask) ) ) { } @@ -140,8 +142,8 @@ public: } #if defined(_WIN64) - operator unsigned __int64 () const { - return (unsigned __int64)(m_val & index_mask); + operator unsigned int64_t () const { + return (unsigned int64_t)(m_val & index_mask); } #endif |