--- a/stage4/generate_c/generate_c.cc	Sun Dec 14 19:15:29 2014 +0000
+++ b/stage4/generate_c/generate_c.cc	Wed Dec 17 13:46:36 2014 +0000
@@ -53,8 +53,8 @@
 
 
 /* Macros to access the constant value of each expression (if it exists) from the annotation introduced to the symbol_c object by constant_folding_c in stage3! */
-#define VALID_CVALUE(dtype, symbol)           (symbol_c::cs_const_value == (symbol)->const_value._##dtype.status)
-#define GET_CVALUE(dtype, symbol)             ((symbol)->const_value._##dtype.value) 
+#define VALID_CVALUE(dtype, symbol)           ((symbol)->const_value._##dtype.is_valid())
+#define GET_CVALUE(dtype, symbol)             ((symbol)->const_value._##dtype.get())