diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-22 10:37:49 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-22 10:37:49 +0000 |
| commit | 5767d9b188cd3efadbd30e2decd963c0d168fdbc (patch) | |
| tree | 6ba9f61ce8d24ea8b5707aa21bb6600f8d08e84f /searchlib/src/tests/fef/featureoverride/featureoverride.cpp | |
| parent | c9f97f7effb5fcd2a8ffe620258cd5629fb7dc73 (diff) | |
| parent | f4a65c8f7cb27bd0e449d99e223ba1a0d9135049 (diff) | |
Merge branch 'master' into bratseth/nonfunctional-changes-4
Conflicts:
vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java
Diffstat (limited to 'searchlib/src/tests/fef/featureoverride/featureoverride.cpp')
| -rw-r--r-- | searchlib/src/tests/fef/featureoverride/featureoverride.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/searchlib/src/tests/fef/featureoverride/featureoverride.cpp b/searchlib/src/tests/fef/featureoverride/featureoverride.cpp index 0ff7e0899e9..e55bd7081a1 100644 --- a/searchlib/src/tests/fef/featureoverride/featureoverride.cpp +++ b/searchlib/src/tests/fef/featureoverride/featureoverride.cpp @@ -141,7 +141,8 @@ TEST("test overrides") overrides.add("value(1,2,3).2", "6.0"); overrides.add("bogus(feature)", "10.0"); - rankProgram->setup(mdl, queryEnv, overrides); + MatchData::UP match_data = mdl.createMatchData(); + rankProgram->setup(*match_data, queryEnv, overrides); std::map<vespalib::string, feature_t> res = Utils::getAllFeatures(*rankProgram, 2); |