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