Merge pull request #394 from pkesseli/cegis-program-helper-insert-before-ambiguity-fix

Daniel Kroening · web-flow · commit b250ddc92c59 · 2017-01-04T18:45:47.000Z
Fixed ambiguity in mem_fun.
diff --git a/src/cegis/cegis-util/program_helper.cpp b/src/cegis/cegis-util/program_helper.cpp
@@ -348,8 +348,8 @@ goto_programt::targett insert_after_preserving_source_location(
 goto_programt::targett insert_before_preserving_source_location(
     goto_programt &body, goto_programt::targett pos)
 {
-  const auto op=std::bind1st(std::mem_fun(&goto_programt::insert_before),
-      &body);
+  typedef goto_programt::targett(goto_programt::*ftype)(goto_programt::targett);
+  const auto op=std::bind1st(std::mem_fun(static_cast<ftype>(&goto_programt::insert_before)), &body);
   return insert_preserving_source_location(pos, op);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,8 @@ goto_programt::targett insert_after_preserving_source_location(`
`348`	`348`	`goto_programt::targett insert_before_preserving_source_location(`
`349`	`349`	`goto_programt &body, goto_programt::targett pos)`
`350`	`350`	`{`
`351`		`- const auto op=std::bind1st(std::mem_fun(&goto_programt::insert_before),`
`352`		`- &body);`
	`351`	`+ typedef goto_programt::targett(goto_programt::*ftype)(goto_programt::targett);`
	`352`	`+ const auto op=std::bind1st(std::mem_fun(static_cast<ftype>(&goto_programt::insert_before)), &body);`
`353`	`353`	`return insert_preserving_source_location(pos, op);`
`354`	`354`	`}`
`355`	`355`