diff options
| author | erwincoumans <erwincoumans@google.com> | 2020-08-11 08:29:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 08:29:35 -0700 |
| commit | 19dfc6754a2d3d1f62bad692aeff55983d40ea35 (patch) | |
| tree | 97a45cf3b419d8ae8eb12fc70133565d35af9941 | |
| parent | b2a473da1949f22bffb9839e536b3991276ecf8b (diff) | |
| parent | 3726c72d11e4a8a27d10450c2e5a8b40ef140110 (diff) | |
| download | bullet3-19dfc6754a2d3d1f62bad692aeff55983d40ea35.tar.gz | |
Merge pull request #2971 from WilliamTambellini/fixWarning
Fix warning in examples/Utils/ChromeTraceUtil.cpp
| -rw-r--r-- | examples/Utils/ChromeTraceUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/Utils/ChromeTraceUtil.cpp b/examples/Utils/ChromeTraceUtil.cpp index a7eca7604..68a84effb 100644 --- a/examples/Utils/ChromeTraceUtil.cpp +++ b/examples/Utils/ChromeTraceUtil.cpp @@ -5,6 +5,7 @@ #include "LinearMath/btAlignedObjectArray.h" #include "Bullet3Common/b3Logging.h" #include <stdio.h> +#include <climits> struct btTiming { @@ -111,16 +112,15 @@ struct btTimings sprintf(newname, "%s%d", name, counter2++); #ifdef _WIN32 - fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%I64d.%s ,\"ph\":\"B\",\"name\":\"%s\",\"args\":{}},\n", threadId, startTimeDiv1000, startTimeRem1000Str, newname); fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%I64d.%s ,\"ph\":\"E\",\"name\":\"%s\",\"args\":{}}", threadId, endTimeDiv1000, endTimeRem1000Str, newname); - #else - fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%" PRIu64 ".%s ,\"ph\":\"B\",\"name\":\"%s\",\"args\":{}},\n", + // Note: on 64b build, PRIu64 resolves in 'lu' whereas timings ('ts') have to be printed as 'llu'. + fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%llu.%s ,\"ph\":\"B\",\"name\":\"%s\",\"args\":{}},\n", threadId, startTimeDiv1000, startTimeRem1000Str, newname); - fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%" PRIu64 ".%s ,\"ph\":\"E\",\"name\":\"%s\",\"args\":{}}", + fprintf(gTimingFile, "{\"cat\":\"timing\",\"pid\":1,\"tid\":%d,\"ts\":%llu.%s ,\"ph\":\"E\",\"name\":\"%s\",\"args\":{}}", threadId, endTimeDiv1000, endTimeRem1000Str, newname); #endif #endif |