--- a/stage4/generate_c/generate_c_typedecl.cc	Fri Dec 20 11:44:38 2013 +0000
+++ b/stage4/generate_c/generate_c_typedecl.cc	Sun Dec 22 09:50:02 2013 +0000
@@ -98,9 +98,6 @@
       return NULL;
     }
 
-    bool type_is_fb(symbol_c* type_decl) {
-      return search_base_type_c::type_is_fb(type_decl);
-    }
 
 /***************************/
 /* B 0 - Programming Model */
@@ -208,7 +205,7 @@
           s4o.print(" value) {\n");
           s4o.indent_right();
 
-          if (search_base_type_c::type_is_subrange(symbol->integer_type_name)) {
+          if (get_datatype_info_c::is_subrange(symbol->integer_type_name)) {
             s4o.print(s4o.indent_spaces + "value = __CHECK_");
             symbol->integer_type_name->accept(*this);
             s4o.print("(value);\n");
@@ -443,7 +440,7 @@
   symbol->simple_spec_init->accept(*this);
   s4o_incl.print(")\n");
 
-  if (search_base_type_c::type_is_subrange(symbol->simple_type_name)) {
+  if (get_datatype_info_c::is_subrange(symbol->simple_type_name)) {
     s4o.print("#define __CHECK_");
     current_type_name->accept(*this);
     s4o.print(" __CHECK_");