# HG changeset patch
# User Chris Cannam
# Date 1464268620 -3600
# Node ID 6c0531397af831d63dedea5cc3181e45ee7f205b
# Parent  572e5d1faa5b31a886e1a8ad185bbb4bd30d4ce0# Parent  0ec25cf85e78191453c68d11c9d65a8f413ae906
Merge

diff -r 0ec25cf85e78 -r 6c0531397af8 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 0ec25cf85e78 -r 6c0531397af8 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;