X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fringbuffer.h;h=a1a615154261037885d2d48ab659b74be9bddda0;hb=350ed31655b00f3043e5d723606cdd50099fa91b;hp=3502bed21b71cfac2759957b2158f057bfe204a4;hpb=da45f489dd3d923bbba8f1cee39ab445c4bf1b64;p=ardour.git

diff --git a/libs/pbd/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h
index 3502bed21b..a1a6151542 100644
--- a/libs/pbd/pbd/ringbuffer.h
+++ b/libs/pbd/pbd/ringbuffer.h
@@ -30,14 +30,13 @@ class RingBuffer
 	RingBuffer (guint sz) {
 //	size = ffs(sz); /* find first [bit] set is a single inlined assembly instruction. But it looks like the API rounds up so... */
 	guint power_of_two;
-	for (power_of_two = 1; 1U<<power_of_two < sz; power_of_two++);
-		size = 1<<power_of_two;
-		size_mask = size;
-		size_mask -= 1;
-		buf = new T[size];
-		reset ();
-
-	};
+	for (power_of_two = 1; 1U<<power_of_two < sz; power_of_two++) {}
+	size = 1<<power_of_two;
+	size_mask = size;
+	size_mask -= 1;
+	buf = new T[size];
+	reset ();
+	}
 	
 	virtual ~RingBuffer() {
 		delete [] buf;
@@ -56,7 +55,7 @@ class RingBuffer
 	}
 	
 	guint read  (T *dest, guint cnt);
-	guint  write (T *src, guint cnt);
+	guint write (T const * src,  guint cnt);
 
 	struct rw_vector {
 	    T *buf[2];
@@ -159,7 +158,7 @@ RingBuffer<T>::read (T *dest, guint cnt)
 }
 
 template<class T> guint
-RingBuffer<T>::write (T *src, guint cnt)
+RingBuffer<T>::write (T const *src, guint cnt)
 
 {
         guint free_cnt;
@@ -199,7 +198,7 @@ RingBuffer<T>::write (T *src, guint cnt)
 }
 
 template<class T> void
-RingBuffer<T>::get_read_vector (RingBuffer<T>::rw_vector *vec)
+RingBuffer<T>::get_read_vector (typename RingBuffer<T>::rw_vector *vec)
 
 {
 	guint free_cnt;
@@ -239,7 +238,7 @@ RingBuffer<T>::get_read_vector (RingBuffer<T>::rw_vector *vec)
 }
 
 template<class T> void
-RingBuffer<T>::get_write_vector (RingBuffer<T>::rw_vector *vec)
+RingBuffer<T>::get_write_vector (typename RingBuffer<T>::rw_vector *vec)
 
 {
 	guint free_cnt;