changeset 426:a23b9f8b4a59

Merge
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 26 May 2016 14:17:00 +0100
parents 1e0f3478ec23 (diff) 4d4608e73b15 (current diff)
children 905e45637745 335af74a25b6
files build/osx/Makefile.osx
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/build/osx/Makefile.osx	Thu Mar 24 13:29:56 2016 +0000
+++ b/build/osx/Makefile.osx	Thu May 26 14:17:00 2016 +0100
@@ -1,9 +1,9 @@
 
 ARCHFLAGS	?= -mmacosx-version-min=10.7 -arch x86_64 -stdlib=libc++
 
-CFLAGS 		:= $(ARCHFLAGS) -O3 -ftree-vectorize -DUSE_PTHREADS -Iinclude
+CFLAGS 		:= $(ARCHFLAGS) -Wall -O3 -ftree-vectorize -DUSE_PTHREADS -Iinclude
 
-CXXFLAGS  	:= $(CFLAGS)
+CXXFLAGS  	:= $(CFLAGS) -std=c++11
 
 include build/general/Makefile.inc
 
--- a/dsp/rateconversion/Resampler.h	Thu Mar 24 13:29:56 2016 +0000
+++ b/dsp/rateconversion/Resampler.h	Thu May 26 14:17:00 2016 +0100
@@ -79,7 +79,6 @@
     int m_targetRate;
     int m_gcd;
     int m_filterLength;
-    int m_bufferLength;
     int m_latency;
     double m_peakToPole;