fixed broken build on Ubuntu

rtv · Dec 29, 2011 · 0bb4448 · 0bb4448
1 parent b73e86d
commit 0bb4448
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/examples/ctrl/dw.cc b/examples/ctrl/dw.cc
@@ -1,5 +1,5 @@
-#include "idw.h"
 #include "stage.hh"
+#include "idw.h"
 
 using namespace Stg;
 

diff --git a/examples/ctrl/idw.h b/examples/ctrl/idw.h
@@ -13,8 +13,11 @@
 #endif 
 
 // STL container iterator macros - __typeof is a gcc extension
+// WARNING: assumes container is not modified during iteration
+#ifndef FOR_EACH
 #define VAR(V,init) __typeof(init) V=(init)
 #define FOR_EACH(I,C) for(VAR(I,(C).begin());I!=(C).end();++I) 
+#endif
 
 const unsigned int VCOUNT = 32;
 const unsigned int WCOUNT = 32;