Fix merge problems

Two files have moved and sec_driver_parse_optionst has to provide
trivial implementations of can_generate_function_body() and
generate_function_body()

Author: Owen Jones

src/driver/sec_driver_parse_options.cpp

@@ -15,7 +15,7 @@
 
 #include <json/json_parser.h>
 
-#include <goto-programs/convert_nondet.h>
+#include <goto-programs/adjust_float_expressions.h>
 #include <goto-programs/set_properties.h>
 #include <goto-programs/dead_code_elimination.h>
 #include <goto-programs/remove_virtual_functions.h>
@@ -26,13 +26,12 @@
 #include <goto-programs/read_goto_binary.h>
 #include <goto-programs/goto_inline.h>
 
-#include <goto-symex/adjust_float_expressions.h>
-
 #include <analyses/call_graph.h>
 #include <analyses/call_graph_helpers.h>
 #include <analyses/goto_check.h>
 #include <analyses/local_may_alias.h>
 
+#include <java_bytecode/convert_java_nondet.h>
 #include <java_bytecode/java_utils.h>
 #include <java_bytecode/remove_exceptions.h>
 #include <java_bytecode/remove_instanceof.h>
@@ -503,6 +502,20 @@ bool sec_driver_parse_optionst::process_goto_functions(
   return false;
 }
 
+bool sec_driver_parse_optionst::can_generate_function_body(const irep_idt &name)
+{
+  return false;
+}
+
+bool sec_driver_parse_optionst::generate_function_body(
+  const irep_idt &function_name,
+  symbol_table_baset &symbol_table,
+  goto_functiont &function,
+  bool body_available)
+{
+  return false;
+}
+
 /// display command line help
 void sec_driver_parse_optionst::help()
 {

src/driver/sec_driver_parse_options.h

@@ -66,6 +66,14 @@ class sec_driver_parse_optionst final:
     const optionst &options);
   bool process_goto_functions(goto_modelt &goto_model, const optionst &options);
 
+  bool can_generate_function_body(const irep_idt &name);
+
+  bool generate_function_body(
+    const irep_idt &function_name,
+    symbol_table_baset &symbol_table,
+    goto_functiont &function,
+    bool body_available);
+
 private:
   ui_message_handlert ui_message_handler;
   std::unique_ptr<context_sensitive_value_set_analysis_drivert>