[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36860] trunk/blender/intern/container/ CTR_TaggedIndex.h: Fix for mingw 64bit fix.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue May 24 13:19:11 CEST 2011
Revision: 36860
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36860
Author: blendix
Date: 2011-05-24 11:19:11 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Fix for mingw 64bit fix.
Modified Paths:
--------------
trunk/blender/intern/container/CTR_TaggedIndex.h
Modified: trunk/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedIndex.h 2011-05-24 11:15:21 UTC (rev 36859)
+++ trunk/blender/intern/container/CTR_TaggedIndex.h 2011-05-24 11:19:11 UTC (rev 36860)
@@ -102,9 +102,9 @@
#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 @@
}
#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
More information about the Bf-blender-cvs
mailing list