--- a/stage3/remove_forward_dependencies.cc	Fri Dec 26 09:39:18 2014 +0000
+++ b/stage3/remove_forward_dependencies.cc	Fri Dec 26 09:57:02 2014 +0000
@@ -108,7 +108,7 @@
   /*******************************************/
   // return NULL if the symbol is already in the declared_identifiers symbol table, otherwise return the missing symbol!
   void *visit(            poutype_identifier_c *symbol)
-    {if (declared_identifiers->find_value(symbol) != declared_identifiers->end_value()) return NULL; else return symbol;}
+    {if (declared_identifiers->find(symbol) != declared_identifiers->end()) return NULL; else return symbol;}
 };   /* class find_forward_dependencies_c */
 
 
@@ -194,7 +194,7 @@
   if ((search2 != NULL) && (search2->accept(*find_forward_dependencies) != NULL)) return NULL; // A forward depency has not yet been satisfied. Wait for a later iteration to try again!
   if ((search3 != NULL) && (search3->accept(*find_forward_dependencies) != NULL)) return NULL; // A forward depency has not yet been satisfied. Wait for a later iteration to try again!
   /* no forward dependencies found => insert into new AST, and add to the 'defined identifiers' and 'inserted symbol' lists */
-  if (declared_identifiers.find_value(name) == declared_identifiers.end_value())
+  if (declared_identifiers.find(name) == declared_identifiers.end())
       declared_identifiers.insert(name, NULL);  // only add if not yet in the symbol table (an overloaded version of this same POU could have been inderted previously!)
   inserted_symbols.insert(symbol);
   new_tree->add_element(current_code_generation_pragma);