diff src/vamp-sdk/FFTimpl.cpp @ 501:90571dcc371a vamp-kiss-naming

Extensively rename things in the KissFFT headers to use a Vamp prefix. The motivation is not to change anything about the Vamp SDK library builds, but to avoid confusion in case any other code (for example that pulls in the Vamp SDK as part of a wider project definition) accidentally includes these headers instead of, or as well as, some other copy of KissFFT.

--- a/src/vamp-sdk/FFTimpl.cpp	Mon Dec 11 13:22:11 2017 +0000
+++ b/src/vamp-sdk/FFTimpl.cpp	Tue Jan 30 09:56:46 2018 +0000
@@ -2,37 +2,29 @@
 // Override C linkage for KissFFT headers. So long as we have already
 // included all of the other (system etc) headers KissFFT depends on,
 // this should work out OK
-#define KISSFFT_USE_CPP_LINKAGE 1
+#define VAMP_KISSFFT_USE_CPP_LINKAGE 1
 
 namespace Kiss {
 
-#undef KISS_FFT_H
-#undef KISS_FTR_H
-#undef KISS_FFT__GUTS_H
-#undef FIXED_POINT
-#undef USE_SIMD
-#undef kiss_fft_scalar
-
 #ifdef SINGLE_PRECISION_FFT
 #pragma message("Using single-precision FFTs")
-typedef float kiss_fft_scalar;
-#define kiss_fft_scalar float
+typedef float vamp_kiss_fft_scalar;
+#define vamp_kiss_fft_scalar float
 #else
-typedef double kiss_fft_scalar;
-#define kiss_fft_scalar double
+typedef double vamp_kiss_fft_scalar;
+#define vamp_kiss_fft_scalar double
 #endif
 
-inline void free(void *ptr) { ::free(ptr); }
-#include "ext/kiss_fft.c"
-#include "ext/kiss_fftr.c"
+#include "ext/vamp_kiss_fft.c"
+#include "ext/vamp_kiss_fftr.c"
 
-#undef kiss_fft_scalar // leaving only the namespaced typedef
+#undef vamp_kiss_fft_scalar // leaving only the namespaced typedef
 
 }
 
 // Check that this worked, i.e. that we have our own suitably
 // hacked KissFFT header which set this after making the
 // appropriate change
-#ifndef KISSFFT_USED_CPP_LINKAGE
+#ifndef VAMP_KISSFFT_USED_CPP_LINKAGE
 #error "KissFFT header lacks specific linkage adjustment needed for Vamp SDK"
 #endif