diff options
Diffstat (limited to 'searchcore')
3 files changed, 6 insertions, 11 deletions
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/stdincl.h b/searchcore/src/vespa/searchcore/fdispatch/common/stdincl.h index f0378b951a4..f6649cb7357 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/common/stdincl.h +++ b/searchcore/src/vespa/searchcore/fdispatch/common/stdincl.h @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 1999-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once +#include <cstdint> + /** * This method defines the illegal/undefined value for unsigned 32-bit * integer ids. diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.cpp index 4a71bc1f3fa..773f6607a9c 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.cpp @@ -1,12 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 1998-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> +#include "configdesc.h" #include <vespa/searchcore/util/log.h> -#include <vespa/searchcore/fdispatch/search/configdesc.h> +#include <vespa/log/log.h> LOG_SETUP(".search.configdesc"); //---------------------------------------------------------------------- diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h index ea873d3ab30..9f2a65c2f91 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h @@ -1,12 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 1998-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once #include <vespa/searchlib/common/fslimits.h> #include <vespa/searchcore/fdispatch/common/stdincl.h> #include <vespa/searchcore/config/config-partitions.h> +#include <cassert> using vespa::config::search::core::PartitionsConfig; @@ -35,8 +34,7 @@ public: _unitrefcost(1), _isBad(false), _confPartIDOverrides(false) - { - } + { } void SetNext(FastS_EngineDesc *next) { _next = next; } void SetConfPartID(int32_t value) { assert(value >= 0); _confPartID = value; } |