From fd7f30a5b55aa89111ebb47f8dc8af5e91693b1b Mon Sep 17 00:00:00 2001
From: Justin Viiret <justin.viiret@intel.com>
Date: Mon, 18 Apr 2016 13:21:34 +1000
Subject: [PATCH] Merge functions no longer need transfer function

---
 src/rose/rose_build_merge.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp
index 7a329e9a..42dd4d2f 100644
--- a/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@ -2482,10 +2482,6 @@ struct MergeMcClellan {
         return mergeTwoDfas(d1, d2, DFA_MERGE_MAX_STATES, &rm, grey);
     }
 
-    static void transfer(OutfixInfo &outfix, unique_ptr<raw_dfa> d) {
-        outfix.proto = move(d);
-    }
-
 private:
     const ReportManager &rm;
     const Grey &grey;
@@ -2500,10 +2496,6 @@ struct MergeHaig {
         return attemptToMergeHaig({d1, d2}, limit);
     }
 
-    static void transfer(OutfixInfo &outfix, unique_ptr<raw_som_dfa> d) {
-        outfix.proto = move(d);
-    }
-
 private:
     const u32 limit; //!< state limit for merged result.
 };
@@ -2550,7 +2542,7 @@ void pairwiseDfaMerge(vector<RawDfa *> &dfas,
             RawDfa *dfa_ptr = rdfa.get();
             dfa_mapping[dfa_ptr] = dfa_mapping[*it];
             dfa_mapping.erase(*it);
-            merge_func.transfer(winner, move(rdfa));
+            winner.proto = move(rdfa);
 
             mergeOutfixInfo(winner, victim);