diff -Naur ETL-0.04.14.orig/ETL/_bezier.h ETL-0.04.14/ETL/_bezier.h
--- ETL-0.04.14.orig/ETL/_bezier.h	2011-07-27 13:18:00.000000000 -0700
+++ ETL-0.04.14/ETL/_bezier.h	2011-07-27 21:29:16.000000000 -0700
@@ -563,8 +563,8 @@
 			for(;i;i--)
 			{
 				// compare 33% of the way between r and s with 67% of the way between r and s
-				if(dist(operator()((s-r)*(1.0/3.0)+r), x) <
-				   dist(operator()((s-r)*(2.0/3.0)+r), x))
+				if(dist(this->operator()((s-r)*(1.0/3.0)+r), x) <
+				   dist(this->operator()((s-r)*(2.0/3.0)+r), x))
 					s=t;
 				else
 					r=t;
@@ -579,15 +579,15 @@
 		const time_type inc((s-r)/steps);
 		if (!inc) return 0;
 		distance_type ret(0);
-		value_type last(operator()(r));
+		value_type last(this->operator()(r));
 
 		for(r+=inc;r<s;r+=inc)
 		{
-			const value_type n(operator()(r));
+			const value_type n(this->operator()(r));
 			ret+=dist.uncook(dist(last,n));
 			last=n;
 		}
-		ret+=dist.uncook(dist(last,operator()(r)))*(s-(r-inc))/inc;
+		ret+=dist.uncook(dist(last,this->operator()(r)))*(s-(r-inc))/inc;
 
 		return ret;
 	}
@@ -623,16 +623,16 @@
 		rt[3] = d;
 
 		//2nd stage calc
-		lt[1] = affine_func(a,b,t);
-		temp = affine_func(b,c,t);
-		rt[2] = affine_func(c,d,t);
+		lt[1] = this->affine_func(a,b,t);
+		temp = this->affine_func(b,c,t);
+		rt[2] = this->affine_func(c,d,t);
 
 		//3rd stage calc
-		lt[2] = affine_func(lt[1],temp,t);
-		rt[1] = affine_func(temp,rt[2],t);
+		lt[2] = this->affine_func(lt[1],temp,t);
+		rt[1] = this->affine_func(temp,rt[2],t);
 
 		//last stage calc
-		lt[3] = rt[0] = affine_func(lt[2],rt[1],t);
+		lt[3] = rt[0] = this->affine_func(lt[2],rt[1],t);
 
 		//set the time range for l,r (the inside values should be 1, 0 respectively)
 		lt.set_r(get_r());
diff -Naur ETL-0.04.14.orig/ETL/_clock_base.h ETL-0.04.14/ETL/_clock_base.h
--- ETL-0.04.14.orig/ETL/_clock_base.h	2011-07-27 13:18:00.000000000 -0700
+++ ETL-0.04.14/ETL/_clock_base.h	2011-10-14 17:57:16.000000000 -0700
@@ -74,7 +74,7 @@
 	{ get_current_time(base_time); }
 
 	value_type operator()()const
-	{ return timestamp_to_seconds(get_current_time()-base_time); }
+	{ return this->timestamp_to_seconds(get_current_time()-base_time); }
 
 	value_type pop_time()
 	{
@@ -84,7 +84,7 @@
 		// Put the current time into base_time
 		get_current_time(base_time);
 
-		return timestamp_to_seconds(base_time-old_time);
+		return this->timestamp_to_seconds(base_time-old_time);
 	}
 
 	static void
diff -Naur ETL-0.04.14.orig/ETL/_curve_func.h ETL-0.04.14/ETL/_curve_func.h
--- ETL-0.04.14.orig/ETL/_curve_func.h	2011-07-27 13:18:00.000000000 -0700
+++ ETL-0.04.14/ETL/_curve_func.h	2011-07-27 21:41:40.000000000 -0700
@@ -30,6 +30,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include <functional>
+#include <math.h>
 
 /* -- C L A S S E S --------------------------------------------------------- */
 
diff -Naur ETL-0.04.14.orig/ETL/_smach.h ETL-0.04.14/ETL/_smach.h
--- ETL-0.04.14.orig/ETL/_smach.h	2011-07-27 13:18:00.000000000 -0700
+++ ETL-0.04.14/ETL/_smach.h	2011-10-14 19:58:38.000000000 -0700
@@ -582,7 +582,13 @@
 
 			return ret;
 		}
-		catch(egress_exception) { return egress()?RESULT_ACCEPT:RESULT_ERROR; }
+		catch(egress_exception) { 
+			if (egress()) {
+				RESULT_ACCEPT;
+			} else {
+				RESULT_ERROR;
+			}
+		}
 		catch(pop_exception) { pop_state(); return RESULT_ACCEPT; }
 		catch(const state_base* state) { return enter(state)?RESULT_ACCEPT:RESULT_ERROR; }
 	}