diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-06-12 11:48:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 11:48:38 +0200 |
| commit | 23d9213d4f58410cd78410dc10950b3bab86c563 (patch) | |
| tree | 68f4e14449fe5581fde1a950380286c3d973e3f5 /searchcorespi | |
| parent | 49ea989662f402f6c96737636b497724a4bb457f (diff) | |
| parent | 06d3ba8c9e0edea16dafce70c13280330c4ab59f (diff) | |
Merge branch 'master' into balder/reduce-code-visibility-rebased
Diffstat (limited to 'searchcorespi')
| -rw-r--r-- | searchcorespi/src/.gitignore | 1 | ||||
| -rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/searchcorespi/src/.gitignore b/searchcorespi/src/.gitignore index 49bfd9b85d3..2e8e6fd906a 100644 --- a/searchcorespi/src/.gitignore +++ b/searchcorespi/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/searchcorespi.mak diff --git a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h index bded09143ab..a4b5277b616 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h +++ b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h @@ -2,11 +2,9 @@ #pragma once #include "i_thread_service.h" -#include <vespa/vespalib/util/runnable.h> -#include <vespa/vespalib/util/executor.h> #include <vespa/vespalib/util/syncable.h> -#include <vespa/searchlib/common/isequencedtaskexecutor.h> +namespace search { class ISequencedTaskExecutor; } namespace searchcorespi::index { /** |