1*4882a593SmuzhiyunFrom 30a2ecc7939449f235282eb6de42e367fc5b1867 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Seiderer <ps.report@gmx.net> 3*4882a593SmuzhiyunDate: Thu, 14 Jan 2016 22:13:15 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Fix FBXConverter: use proper 64-bit constant 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUse proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes: 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type 9*4882a593Smuzhiyun code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type 10*4882a593Smuzhiyun code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type 11*4882a593Smuzhiyun code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type 12*4882a593Smuzhiyun code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type 13*4882a593Smuzhiyun code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 16*4882a593Smuzhiyun[Rebased on 5.0.1] 17*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun code/FBX/FBXConverter.cpp | 2 +- 20*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/code/FBX/FBXConverter.cpp b/code/FBXConverter.cpp 23*4882a593Smuzhiyunindex e0c6b9c..b1e9a71 100644 24*4882a593Smuzhiyun--- a/code/FBX/FBXConverter.cpp 25*4882a593Smuzhiyun+++ b/code/FBX/FBXConverter.cpp 26*4882a593Smuzhiyun@@ -67,7 +67,7 @@ namespace FBX { 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun #define MAGIC_NODE_TAG "_$AssimpFbx$" 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun-#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L 31*4882a593Smuzhiyun+#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun // XXX vc9's debugger won't step into anonymous namespaces 34*4882a593Smuzhiyun //namespace { 35*4882a593Smuzhiyun-- 36*4882a593Smuzhiyun2.1.4 37*4882a593Smuzhiyun 38