diff options
author | Paul Baltescu <pauldb89@gmail.com> | 2013-02-01 16:11:10 +0000 |
---|---|---|
committer | Paul Baltescu <pauldb89@gmail.com> | 2013-02-01 16:11:10 +0000 |
commit | 252fb164c208ec8f3005f8a652eb3b48c0644e3d (patch) | |
tree | 7199cb668e77ef89c7bcccb37d70554e3b52c2a5 /extractor/mocks/mock_linear_merger.h | |
parent | 4ab84a0be28fdb6c0c421fe5ba5e09cfa298f2d1 (diff) |
Second working commit.
Diffstat (limited to 'extractor/mocks/mock_linear_merger.h')
-rw-r--r-- | extractor/mocks/mock_linear_merger.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/extractor/mocks/mock_linear_merger.h b/extractor/mocks/mock_linear_merger.h index 0defa88a..82243428 100644 --- a/extractor/mocks/mock_linear_merger.h +++ b/extractor/mocks/mock_linear_merger.h @@ -2,19 +2,13 @@ #include <vector> -#include "linear_merger.h" -#include "phrase.h" +#include "../linear_merger.h" +#include "../phrase.h" using namespace std; class MockLinearMerger: public LinearMerger { public: - MockLinearMerger(shared_ptr<Vocabulary> vocabulary, - shared_ptr<DataArray> data_array, - shared_ptr<MatchingComparator> comparator) : - LinearMerger(vocabulary, data_array, comparator) {} - - MOCK_CONST_METHOD9(Merge, void(vector<int>&, const Phrase&, const Phrase&, vector<int>::iterator, vector<int>::iterator, vector<int>::iterator, vector<int>::iterator, int, int)); |