From 4ac88bd16f3dfd9b3e338775a9eeb512b526b60a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 24 May 2011 11:19:11 +0000 Subject: Fix for mingw 64bit fix. --- intern/container/CTR_TaggedIndex.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern') 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 -- cgit v1.2.3