From 36bc55a33b5f075f6479c64f94d60ecbbd1f3270 Mon Sep 17 00:00:00 2001
From: Paul Baltescu <pauldb89@gmail.com>
Date: Tue, 25 Jun 2013 17:28:54 +0100
Subject: Undo last commit.

---
 extractor/fast_intersector_test.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'extractor/fast_intersector_test.cc')

diff --git a/extractor/fast_intersector_test.cc b/extractor/fast_intersector_test.cc
index 2e618b63..76c3aaea 100644
--- a/extractor/fast_intersector_test.cc
+++ b/extractor/fast_intersector_test.cc
@@ -60,14 +60,14 @@ class FastIntersectorTest : public Test {
 
     precomputation = make_shared<MockPrecomputation>();
     EXPECT_CALL(*precomputation, GetCollocations())
-        .WillRepeatedly(Return(collocations));
+        .WillRepeatedly(ReturnRef(collocations));
 
     phrase_builder = make_shared<PhraseBuilder>(vocabulary);
     intersector = make_shared<FastIntersector>(suffix_array, precomputation,
                                                vocabulary, 15, 1);
   }
 
-  Collocations collocations;
+  Index collocations;
   shared_ptr<MockDataArray> data_array;
   shared_ptr<MockSuffixArray> suffix_array;
   shared_ptr<MockPrecomputation> precomputation;
@@ -82,9 +82,9 @@ TEST_F(FastIntersectorTest, TestCachedCollocation) {
   Phrase phrase = phrase_builder->Build(symbols);
   PhraseLocation prefix_location(15, 16), suffix_location(16, 17);
 
-  collocations.push_back(make_pair(symbols, expected_location));
+  collocations[symbols] = expected_location;
   EXPECT_CALL(*precomputation, GetCollocations())
-      .WillRepeatedly(Return(collocations));
+      .WillRepeatedly(ReturnRef(collocations));
   intersector = make_shared<FastIntersector>(suffix_array, precomputation,
                                              vocabulary, 15, 1);
 
-- 
cgit v1.2.3