Merges with Felipe's branch. Minor bug fix

Author: Aren Babikian

src/goto-instrument/code_contracts.h

@@ -168,12 +168,6 @@ class code_contractst
   void
   add_contract_check(const irep_idt &, const irep_idt &, goto_programt &dest);
 
-  const symbolt &new_tmp_symbol(
-    const typet &type,
-    const source_locationt &source_location,
-    const irep_idt &function_id,
-    const irep_idt &mode);
-
   //If the expression is a quantified expression, this function adds
   //the quantified variable to the symbol table and to the expression map
   void add_quantified_variable(