--- a/stage1_2/stage1_2.cc	Mon Nov 26 16:38:15 2012 +0000
+++ b/stage1_2/stage1_2.cc	Tue Nov 27 14:49:08 2012 +0000
@@ -292,11 +292,6 @@
              bool full_token_loc         /* error messages specify full token location */
             );
 
-int sstage2__(const char *text,
-              symbol_c **tree_root_ref,
-              bool full_token_loc         /* error messages specify full token location */
-             );
-
 
 int stage1_2(const char *filename, symbol_c **tree_root_ref, stage1_2_options_t options) {
       /* NOTE: we only call stage2 (bison - syntax analysis) directly, as stage 2 will itself call stage1 (flex - lexical analysis)
@@ -312,13 +307,6 @@
 
   safe_extensions_ = options.safe_extensions;
   conversion_functions_ = options.conversion_functions;
-  int ret = stage2__(filename, options.includedir, tree_root_ref, options.full_token_loc);
-
-  if (conversion_functions_) {
-	  create_enumtype_conversion_functions_c create_enumtype_conversion_functions_c(*tree_root_ref);
-	  std::string source_code = create_enumtype_conversion_functions_c.get_declaration(*tree_root_ref);
-	  ret = sstage2__(source_code.c_str(), tree_root_ref, false);
-  }
-  return ret;
-}
-
+  return stage2__(filename, options.includedir, tree_root_ref, options.full_token_loc);
+}
+