32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Kjetil Matheussen <k.s.matheussen@notam02.no>
|
|||
|
|
Date: Sat, 15 Jul 2017 13:21:59 +0200
|
|||
|
|
Subject: [PATCH] Tests: Fix compilation with gcc7
|
|||
|
|
|
|||
|
|
Fixes
|
|||
|
|
../tests/test.cpp: In function ‘int process4(jack_nframes_t, void*)’:
|
|||
|
|
../tests/test.cpp:483:73: error: call of overloaded ‘abs(jack_nframes_t)’ is ambiguous
|
|||
|
|
if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
|
|||
|
|
|
|||
|
|
Downloaded from upstream commit
|
|||
|
|
https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655
|
|||
|
|
|
|||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|||
|
|
---
|
|||
|
|
tests/test.cpp | 2 +-
|
|||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
diff --git a/tests/test.cpp b/tests/test.cpp
|
|||
|
|
index 8a8a8117..d2ef9a05 100644
|
|||
|
|
--- a/tests/test.cpp
|
|||
|
|
+++ b/tests/test.cpp
|
|||
|
|
@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
|
|||
|
|
jack_nframes_t delta_time = cur_time - last_time;
|
|||
|
|
|
|||
|
|
Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
|
|||
|
|
- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
|
|||
|
|
+ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
|
|||
|
|
printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
|
|||
|
|
}
|
|||
|
|
|