# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1464268620 -3600
# Node ID a23b9f8b4a59d0ab5991df5feb8dd3d287ed0be8
# Parent  1e0f3478ec236437bb87000e5570359f21b497a8# Parent  4d4608e73b15df872420f8f51f10435c238a2c52
Merge

diff -r 4d4608e73b15 -r a23b9f8b4a59 build/osx/Makefile.osx
--- 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
 
diff -r 4d4608e73b15 -r a23b9f8b4a59 dsp/rateconversion/Resampler.h
--- 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;