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 /juniper | |
parent | 876b07cf8ce2f17d08c772381877a468feefc7b4 (diff) |
Do not include fastos.h in header files.
Diffstat (limited to 'juniper')
-rw-r--r-- | juniper/src/test/testenv.h | 1 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/IJuniperProperties.h | 9 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/ITokenProcessor.h | 1 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/juniperparams.h | 1 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/keyocc.h | 1 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/query.h | 1 | ||||
-rw-r--r-- | juniper/src/vespa/juniper/rewriter.h | 1 |
7 files changed, 2 insertions, 13 deletions
diff --git a/juniper/src/test/testenv.h b/juniper/src/test/testenv.h index e7dde4da552..1200ce6928e 100644 --- a/juniper/src/test/testenv.h +++ b/juniper/src/test/testenv.h @@ -3,7 +3,6 @@ /* Include most of the stuff that we might need */ -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/fastlib/text/normwordfolder.h> #include <vespa/juniper/query.h> diff --git a/juniper/src/vespa/juniper/IJuniperProperties.h b/juniper/src/vespa/juniper/IJuniperProperties.h index d52b1e69058..7f5727b3b88 100644 --- a/juniper/src/vespa/juniper/IJuniperProperties.h +++ b/juniper/src/vespa/juniper/IJuniperProperties.h @@ -1,9 +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> -/** @file IJuniperProperties.h Defining the IJuniperProperties class */ +#pragma once /** An abstract interface to configuration file settings used by Juniper to process * it's preconfigured parameter sets. @@ -18,9 +15,7 @@ public: * @param def A default value for the property if not found in configuration * @return The value of the property or @param def if no such property is set */ - virtual const char* GetProperty(const char* name, const char* def = NULL) = 0; + virtual const char* GetProperty(const char* name, const char* def = nullptr) = 0; virtual ~IJuniperProperties() {}; }; - - diff --git a/juniper/src/vespa/juniper/ITokenProcessor.h b/juniper/src/vespa/juniper/ITokenProcessor.h index 2bfe42ebb51..ff357c78335 100644 --- a/juniper/src/vespa/juniper/ITokenProcessor.h +++ b/juniper/src/vespa/juniper/ITokenProcessor.h @@ -1,6 +1,5 @@ // 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/fastlib/text/unicodeutil.h> /** Implement this interface for objects that intend to serve as processing stages in diff --git a/juniper/src/vespa/juniper/juniperparams.h b/juniper/src/vespa/juniper/juniperparams.h index c5b97ec6d46..d6fd0f46031 100644 --- a/juniper/src/vespa/juniper/juniperparams.h +++ b/juniper/src/vespa/juniper/juniperparams.h @@ -2,7 +2,6 @@ #pragma once #include <string> -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/text/wordfolder.h> class SummaryConfig; diff --git a/juniper/src/vespa/juniper/keyocc.h b/juniper/src/vespa/juniper/keyocc.h index 476a2c1a1be..aa8e9cf3e17 100644 --- a/juniper/src/vespa/juniper/keyocc.h +++ b/juniper/src/vespa/juniper/keyocc.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 "multiset.h" #include <vector> #include "matchelem.h" diff --git a/juniper/src/vespa/juniper/query.h b/juniper/src/vespa/juniper/query.h index e4e2d7c3ee8..a7cd82ae308 100644 --- a/juniper/src/vespa/juniper/query.h +++ b/juniper/src/vespa/juniper/query.h @@ -7,7 +7,6 @@ #define JUNIPER_RPIF 1 #endif -#include <vespa/fastos/fastos.h> /** @file query.h * This file describes describes Juniper's expected interface for diff --git a/juniper/src/vespa/juniper/rewriter.h b/juniper/src/vespa/juniper/rewriter.h index ce46c83214a..33c4e2b874c 100644 --- a/juniper/src/vespa/juniper/rewriter.h +++ b/juniper/src/vespa/juniper/rewriter.h @@ -3,7 +3,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include "query.h" /** @file rewriter.h |