diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-18 03:23:53 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-19 14:15:44 +0000 |
commit | ef031ed8d62e86a7355200b6982682d39dee5032 (patch) | |
tree | b13ef2676937b1977313bdf7f158432bf3e67a57 /searchlib/src | |
parent | 876b07cf8ce2f17d08c772381877a468feefc7b4 (diff) |
Do not include fastos.h in header files.
Diffstat (limited to 'searchlib/src')
30 files changed, 11 insertions, 51 deletions
diff --git a/searchlib/src/apps/loadattribute/loadattribute.cpp b/searchlib/src/apps/loadattribute/loadattribute.cpp index 1c7e940d381..ea1a3697f4c 100644 --- a/searchlib/src/apps/loadattribute/loadattribute.cpp +++ b/searchlib/src/apps/loadattribute/loadattribute.cpp @@ -9,6 +9,7 @@ #include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/fastlib/io/bufferedfile.h> +#include <vespa/fastos/app.h> namespace search { diff --git a/searchlib/src/tests/attribute/attributesearcher.h b/searchlib/src/tests/attribute/attributesearcher.h index 7456d22f306..8f9618b27db 100644 --- a/searchlib/src/tests/attribute/attributesearcher.h +++ b/searchlib/src/tests/attribute/attributesearcher.h @@ -3,7 +3,6 @@ #pragma once #include "runnable.h" -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/attribute/attribute.h> #include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/queryeval/hitcollector.h> diff --git a/searchlib/src/tests/attribute/runnable.h b/searchlib/src/tests/attribute/runnable.h index 418230a2fc5..5038c22a1a5 100644 --- a/searchlib/src/tests/attribute/runnable.h +++ b/searchlib/src/tests/attribute/runnable.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/util/sync.h> namespace search { diff --git a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h index 63d41005932..e661431209c 100644 --- a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h +++ b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/parsequery/stackdumpiterator.h> class StackDumpIteratorTest : public FastOS_Application diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp index 1199ff48843..1e569f8791a 100644 --- a/searchlib/src/tests/transactionlogstress/translogstress.cpp +++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp @@ -6,6 +6,7 @@ #include <vespa/searchlib/util/rand48.h> #include <vespa/searchlib/util/runnable.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> +#include <vespa/fastos/app.h> #include <iostream> #include <stdexcept> diff --git a/searchlib/src/vespa/searchlib/aggregation/aggregation.h b/searchlib/src/vespa/searchlib/aggregation/aggregation.h index cedb5571c6e..e17ee88c113 100644 --- a/searchlib/src/vespa/searchlib/aggregation/aggregation.h +++ b/searchlib/src/vespa/searchlib/aggregation/aggregation.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/common/identifiable.h> #include <vespa/searchlib/common/rankedhit.h> #include <vespa/searchlib/attribute/attributeguard.h> diff --git a/searchlib/src/vespa/searchlib/aggregation/hit.h b/searchlib/src/vespa/searchlib/aggregation/hit.h index 2f628c3003c..cd9758722ed 100644 --- a/searchlib/src/vespa/searchlib/aggregation/hit.h +++ b/searchlib/src/vespa/searchlib/aggregation/hit.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/common/identifiable.h> #include <vespa/searchlib/common/hitrank.h> #include "rawrank.h" diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h index a31693823b7..439c787f88f 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.h +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include "enumstorebase.h" #include <vespa/searchlib/util/foldedstringcompare.h> #include <vespa/vespalib/util/buffer.h> diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.h b/searchlib/src/vespa/searchlib/bitcompression/compression.h index b2924dc42b7..6a8e1ce6790 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/compression.h +++ b/searchlib/src/vespa/searchlib/bitcompression/compression.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/util/comprfile.h> #include <vespa/searchlib/index/postinglistparams.h> #include <vespa/vespalib/stllike/string.h> diff --git a/searchlib/src/vespa/searchlib/common/gid.h b/searchlib/src/vespa/searchlib/common/gid.h index ac76c72fe7e..d896fa7d6b3 100644 --- a/searchlib/src/vespa/searchlib/common/gid.h +++ b/searchlib/src/vespa/searchlib/common/gid.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/common/indexmetainfo.h b/searchlib/src/vespa/searchlib/common/indexmetainfo.h index 823f69e7a94..df731004362 100644 --- a/searchlib/src/vespa/searchlib/common/indexmetainfo.h +++ b/searchlib/src/vespa/searchlib/common/indexmetainfo.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/stllike/string.h> #include <vector> diff --git a/searchlib/src/vespa/searchlib/common/sortdata.h b/searchlib/src/vespa/searchlib/common/sortdata.h index 186e534ad5b..33a47841c9c 100644 --- a/searchlib/src/vespa/searchlib/common/sortdata.h +++ b/searchlib/src/vespa/searchlib/common/sortdata.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> namespace search { namespace common { diff --git a/searchlib/src/vespa/searchlib/common/sortresults.cpp b/searchlib/src/vespa/searchlib/common/sortresults.cpp index 8878e8bdd19..c071e06f3db 100644 --- a/searchlib/src/vespa/searchlib/common/sortresults.cpp +++ b/searchlib/src/vespa/searchlib/common/sortresults.cpp @@ -73,7 +73,6 @@ FastS_radixsort(RankedHit a[], uint32_t n, uint32_t ntop) memset(cnt, 0, 256*sizeof(uint32_t)); // Count occurrences [NB: will fail with n < 3] for(i = 0; i < n - 3; i += 4) { - FastOS_Prefetch::NT(((char *)(&a[i])) + PREFETCH); cnt[(R(a[i]._rankValue) >> SHIFT) & 0xFF]++; cnt[(R(a[i + 1]._rankValue) >> SHIFT) & 0xFF]++; cnt[(R(a[i + 2]._rankValue) >> SHIFT) & 0xFF]++; diff --git a/searchlib/src/vespa/searchlib/common/sortspec.h b/searchlib/src/vespa/searchlib/common/sortspec.h index 80b5cfaf795..bc8af043d55 100644 --- a/searchlib/src/vespa/searchlib/common/sortspec.h +++ b/searchlib/src/vespa/searchlib/common/sortspec.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/util/buffer.h> #include <vector> #include <vespa/vespalib/stllike/string.h> diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h index a54d2660a5f..90e975d8221 100644 --- a/searchlib/src/vespa/searchlib/common/transport.h +++ b/searchlib/src/vespa/searchlib/common/transport.h @@ -6,7 +6,6 @@ #pragma once -#include <vespa/fastos/fastos.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/expression/expressionnode.h b/searchlib/src/vespa/searchlib/expression/expressionnode.h index 69b7f430193..d22601326ca 100644 --- a/searchlib/src/vespa/searchlib/expression/expressionnode.h +++ b/searchlib/src/vespa/searchlib/expression/expressionnode.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/common/identifiable.h> #include <vespa/vespalib/objects/identifiable.hpp> #include <vespa/vespalib/objects/visit.h> diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/computer.h b/searchlib/src/vespa/searchlib/features/fieldmatch/computer.h index 7e14c51a74c..6d71cd9a201 100644 --- a/searchlib/src/vespa/searchlib/features/fieldmatch/computer.h +++ b/searchlib/src/vespa/searchlib/features/fieldmatch/computer.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/fef/iqueryenvironment.h> #include <vespa/searchlib/fef/fieldinfo.h> #include <vespa/searchlib/fef/matchdata.h> diff --git a/searchlib/src/vespa/searchlib/query/base.h b/searchlib/src/vespa/searchlib/query/base.h index ba066b5410d..d8e94de2b3e 100644 --- a/searchlib/src/vespa/searchlib/query/base.h +++ b/searchlib/src/vespa/searchlib/query/base.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastos/thread.h> #include <vespa/fastos/time.h> #include <vespa/fastlib/text/unicodeutil.h> diff --git a/searchlib/src/vespa/searchlib/query/tree/simplequery.h b/searchlib/src/vespa/searchlib/query/tree/simplequery.h index e0f66d70f28..0970ca597ae 100644 --- a/searchlib/src/vespa/searchlib/query/tree/simplequery.h +++ b/searchlib/src/vespa/searchlib/query/tree/simplequery.h @@ -7,7 +7,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include "intermediatenodes.h" #include "termnodes.h" diff --git a/searchlib/src/vespa/searchlib/query/tree/term.h b/searchlib/src/vespa/searchlib/query/tree/term.h index dafcc3976da..c13a586dd01 100644 --- a/searchlib/src/vespa/searchlib/query/tree/term.h +++ b/searchlib/src/vespa/searchlib/query/tree/term.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/searchlib/query/tree/node.h> #include <vespa/searchlib/query/weight.h> diff --git a/searchlib/src/vespa/searchlib/queryeval/iterator_pack.h b/searchlib/src/vespa/searchlib/queryeval/iterator_pack.h index b64af50a827..ac19bca3626 100644 --- a/searchlib/src/vespa/searchlib/queryeval/iterator_pack.h +++ b/searchlib/src/vespa/searchlib/queryeval/iterator_pack.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include "searchiterator.h" #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/fef/matchdata.h> diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h index 59eb2f6be9a..1c081b8ecd7 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h +++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h @@ -5,23 +5,15 @@ #include <map> #include <vector> #include <atomic> -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/memory.h> +#include <vespa/fastos/file.h> -namespace search -{ +namespace search { -namespace common -{ +namespace common { class FileHeaderContext; } -class FileHeaderContext; - -} - - -namespace transactionlog -{ +namespace transactionlog { class DomainPart { private: diff --git a/searchlib/src/vespa/searchlib/util/comprbuffer.h b/searchlib/src/vespa/searchlib/util/comprbuffer.h index 43a67bcfb97..9769f60fedb 100644 --- a/searchlib/src/vespa/searchlib/util/comprbuffer.h +++ b/searchlib/src/vespa/searchlib/util/comprbuffer.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/util/filealign.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/util/comprfile.h b/searchlib/src/vespa/searchlib/util/comprfile.h index 8c05884a0f1..29c3af9a945 100644 --- a/searchlib/src/vespa/searchlib/util/comprfile.h +++ b/searchlib/src/vespa/searchlib/util/comprfile.h @@ -4,18 +4,13 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <utility> #include <vespa/searchlib/util/filealign.h> #include <vespa/searchlib/util/comprbuffer.h> -namespace vespalib -{ - -class nbostream; - -} +class FastOS_FileInterface; +namespace vespalib { class nbostream; } namespace search { diff --git a/searchlib/src/vespa/searchlib/util/filealign.h b/searchlib/src/vespa/searchlib/util/filealign.h index 2bad98c9dd3..23586d02eea 100644 --- a/searchlib/src/vespa/searchlib/util/filealign.h +++ b/searchlib/src/vespa/searchlib/util/filealign.h @@ -2,15 +2,11 @@ #pragma once -namespace vespalib -{ - -class nbostream; +class FastOS_FileInterface; -} +namespace vespalib { class nbostream; } -namespace search -{ +namespace search { class FileAlign { diff --git a/searchlib/src/vespa/searchlib/util/foldedstringcompare.h b/searchlib/src/vespa/searchlib/util/foldedstringcompare.h index 1904e0ca940..1a4945335c0 100644 --- a/searchlib/src/vespa/searchlib/util/foldedstringcompare.h +++ b/searchlib/src/vespa/searchlib/util/foldedstringcompare.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/util/memorytub.h b/searchlib/src/vespa/searchlib/util/memorytub.h index 40068e8e674..a217bf29622 100644 --- a/searchlib/src/vespa/searchlib/util/memorytub.h +++ b/searchlib/src/vespa/searchlib/util/memorytub.h @@ -10,7 +10,6 @@ #include <new> -#include <vespa/fastos/fastos.h> namespace search { namespace util { diff --git a/searchlib/src/vespa/searchlib/util/rand48.h b/searchlib/src/vespa/searchlib/util/rand48.h index 91fcf1b03e9..d8bfa683f15 100644 --- a/searchlib/src/vespa/searchlib/util/rand48.h +++ b/searchlib/src/vespa/searchlib/util/rand48.h @@ -4,7 +4,6 @@ #pragma once -#include <vespa/fastos/fastos.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/util/randomgenerator.h b/searchlib/src/vespa/searchlib/util/randomgenerator.h index 92a7b190e80..b5cf60a4899 100644 --- a/searchlib/src/vespa/searchlib/util/randomgenerator.h +++ b/searchlib/src/vespa/searchlib/util/randomgenerator.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/searchlib/util/rand48.h> #include <vespa/vespalib/stllike/string.h> #include <vector> diff --git a/searchlib/src/vespa/searchlib/util/runnable.h b/searchlib/src/vespa/searchlib/util/runnable.h index 437a2333231..16dfdc06bd2 100644 --- a/searchlib/src/vespa/searchlib/util/runnable.h +++ b/searchlib/src/vespa/searchlib/util/runnable.h @@ -2,7 +2,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/util/sync.h> namespace search { |