[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36858] trunk/blender/intern: Attempt to fix mingw 64 bit compile error.

[Brecht Van Lommel]

Revision: 36858
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36858
Author:   blendix
Date:     2011-05-24 11:01:39 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Attempt to fix mingw 64 bit compile error.

Modified Paths:
--------------
    trunk/blender/intern/bsp/CMakeLists.txt
    trunk/blender/intern/bsp/SConscript
    trunk/blender/intern/container/CTR_TaggedIndex.h
    trunk/blender/intern/decimation/CMakeLists.txt
    trunk/blender/intern/decimation/SConscript

Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt     2011-05-24 10:15:02 UTC (rev 
36857)
+++ trunk/blender/intern/bsp/CMakeLists.txt     2011-05-24 11:01:39 UTC (rev 
36858)
@@ -27,6 +27,7 @@
 set(INC
        ./intern
        ../container
+       ../guardedalloc
        ../moto/include
        ../memutil
 )

Modified: trunk/blender/intern/bsp/SConscript
===================================================================
--- trunk/blender/intern/bsp/SConscript 2011-05-24 10:15:02 UTC (rev 36857)
+++ trunk/blender/intern/bsp/SConscript 2011-05-24 11:01:39 UTC (rev 36858)
@@ -3,7 +3,7 @@
 
 sources = env.Glob('intern/*.cpp')
 
-incs = 'intern ../container ../moto/include ../memutil'
+incs = 'intern ../container ../moto/include ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], 
libtype=['core','player'], priority=[200,100] )
 

Modified: trunk/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedIndex.h    2011-05-24 10:15:02 UTC 
(rev 36857)
+++ trunk/blender/intern/container/CTR_TaggedIndex.h    2011-05-24 11:01:39 UTC 
(rev 36858)
@@ -52,6 +52,8 @@
 
 #include <functional>
 
+#include "MEM_sys_types.h"
+
 enum {
 
        empty_tag = 0x0,
@@ -100,9 +102,9 @@
 
 #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 @@
        }
 
 #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
 

Modified: trunk/blender/intern/decimation/CMakeLists.txt
===================================================================
--- trunk/blender/intern/decimation/CMakeLists.txt      2011-05-24 10:15:02 UTC 
(rev 36857)
+++ trunk/blender/intern/decimation/CMakeLists.txt      2011-05-24 11:01:39 UTC 
(rev 36858)
@@ -27,6 +27,7 @@
 set(INC
        .
        ../container
+       ../guardedalloc
        ../memutil
        ../moto/include
 )

Modified: trunk/blender/intern/decimation/SConscript
===================================================================
--- trunk/blender/intern/decimation/SConscript  2011-05-24 10:15:02 UTC (rev 
36857)
+++ trunk/blender/intern/decimation/SConscript  2011-05-24 11:01:39 UTC (rev 
36858)
@@ -3,6 +3,6 @@
 
 sources = env.Glob('intern/*.cpp')
 
-incs = '. ../moto/include ../container ../memutil'
+incs = '. ../moto/include ../container ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], 
libtype=['core', 'player'], priority = [200, 100] )

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs