diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-06 00:57:55 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-06 17:57:25 +0100 |
commit | 1b9151ab93467dd5508cc9c63b674310df0ab0b3 (patch) | |
tree | 11e62fae250894b6e61d580bf95eaf7014fc5fce /searchsummary | |
parent | 65dcaa714247b95459495338f044e89446d9a986 (diff) |
Optimize includes.
Diffstat (limited to 'searchsummary')
16 files changed, 73 insertions, 114 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index eb5219153c1..71f15b0d894 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -1,12 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "docsumwriter.h" +#include "attributedfw.h" +#include "docsumstate.h" #include <vespa/searchlib/attribute/stringbase.h> #include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/attribute/floatbase.h> #include <vespa/searchlib/tensor/tensor_attribute.h> -#include "docsumwriter.h" -#include "attributedfw.h" -#include "docsumstate.h" #include <vespa/eval/tensor/tensor.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp index 82616381e88..5eb7d99473f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp @@ -1,16 +1,14 @@ // 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/searchsummary/docsummary/docsumconfig.h> -#include <vespa/searchsummary/docsummary/docsumwriter.h> -#include <vespa/searchsummary/docsummary/idocsumenvironment.h> -#include <vespa/searchsummary/docsummary/rankfeaturesdfw.h> -#include <vespa/searchsummary/docsummary/textextractordfw.h> -#include <vespa/searchsummary/docsummary/geoposdfw.h> -#include <vespa/searchsummary/docsummary/positionsdfw.h> -#include <vespa/searchsummary/docsummary/juniperdfw.h> -#include <vespa/vespalib/util/vstringfmt.h> +#include "docsumconfig.h" +#include "docsumwriter.h" +#include "idocsumenvironment.h" +#include "rankfeaturesdfw.h" +#include "textextractordfw.h" +#include "geoposdfw.h" +#include "positionsdfw.h" +#include "juniperdfw.h" +#include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> namespace search { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp index ba30940f5e0..e71b4d0fe69 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp @@ -1,18 +1,15 @@ // 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 <vespa/searchlib/attribute/iattributemanager.h> -#include <vespa/searchlib/common/documentlocations.h> -#include <vespa/searchlib/common/location.h> #include "docsumfieldwriter.h" #include "idocsumenvironment.h" #include "docsumformat.h" #include "docsumstate.h" +#include <vespa/searchlib/attribute/iattributemanager.h> +#include <vespa/searchlib/common/documentlocations.h> +#include <vespa/searchlib/common/location.h> #include <vespa/searchlib/parsequery/stackdumpiterator.h> +#include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.docsumfieldwriter"); namespace search { @@ -29,14 +26,10 @@ const vespalib::string IDocsumFieldWriter::_empty(""); //-------------------------------------------------------------------------- -EmptyDFW::EmptyDFW() -{ -} +EmptyDFW::EmptyDFW() { } -EmptyDFW::~EmptyDFW() -{ -} +EmptyDFW::~EmptyDFW() { } void EmptyDFW::insertField(uint32_t /*docid*/, diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp index 27b20f8b1bd..f964eafb2c9 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp @@ -1,17 +1,10 @@ // 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 <vespa/searchsummary/docsummary/docsumformat.h> +#include "docsumformat.h" namespace search { namespace docsummary { -LOG_SETUP(".searchlib.docsummary.docsumformat"); - - size_t DocsumFormat::addByte(search::RawBuf &target, uint8_t value) @@ -101,7 +94,7 @@ DocsumFormat::addEmpty(ResType type, search::RawBuf &target) case RES_FEATUREDATA: return addLongData(target, "", 0); } - LOG_ASSERT(type <= RES_FEATUREDATA); + assert(type <= RES_FEATUREDATA); return 0; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp index d81a45be6de..b8753898014 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp @@ -1,8 +1,5 @@ // 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 "docsumstate.h" #include <vespa/juniper/rpinterface.h> #include <vespa/searchcommon/attribute/iattributecontext.h> diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index 4273c89d7f5..01ebf333fe2 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -1,8 +1,5 @@ // 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/fastlib/text/normwordfolder.h> #include "docsumwriter.h" #include "docsumformat.h" #include "docsumstate.h" @@ -10,6 +7,7 @@ #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/vespalib/data/slime/slime.h> +#include <vespa/fastlib/text/normwordfolder.h> #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.docsumwriter"); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp index f18cf1a4da4..bd83f821ff1 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp @@ -1,24 +1,20 @@ // 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 <cstdio> -#include <vespa/log/log.h> #include "juniperdfw.h" +#include "docsumwriter.h" +#include "docsumfieldwriter.h" +#include "docsumstate.h" +#include "keywordextractor.h" +#include "docsumformat.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/searchlib/util/rawbuf.h> #include <vespa/searchlib/queryeval/split_float.h> #include <vespa/searchlib/fef/properties.h> -#include <vespa/searchsummary/docsummary/docsumwriter.h> -#include <vespa/searchsummary/docsummary/docsumfieldwriter.h> -#include <vespa/searchsummary/docsummary/docsumstate.h> -#include <vespa/searchsummary/docsummary/keywordextractor.h> -#include <vespa/searchsummary/docsummary/docsumformat.h> #include <vespa/vespalib/objects/hexdump.h> #include <vespa/juniper/config.h> +#include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.dynamicteaserdfw"); namespace juniper { @@ -317,9 +313,7 @@ JuniperDFW::JuniperDFW(juniper::Juniper * juniper) } -JuniperDFW::~JuniperDFW() -{ -} +JuniperDFW::~JuniperDFW() { } bool JuniperDFW::Init( diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp index fc434998465..62785709703 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp @@ -1,10 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/searchcommon/config/subscriptionproxyng.h> -#include <vespa/vespalib/util/vstringfmt.h> + #include "juniperproperties.h" +#include <vespa/searchcommon/config/subscriptionproxyng.h> +#include <vespa/vespalib/util/stringfmt.h> using vespa::config::search::summary::JuniperrcConfig; +using vespalib::make_string; namespace search { namespace docsummary { @@ -56,34 +57,34 @@ JuniperProperties::configure(const JuniperrcConfig &cfg) { reset(); _properties["juniper.dynsum.fallback"] = cfg.prefix ? "prefix" : "none"; - _properties["juniper.dynsum.length"] = vespalib::make_vespa_string("%d", cfg.length); - _properties["juniper.dynsum.max_matches"] = vespalib::make_vespa_string("%d", cfg.maxMatches); - _properties["juniper.dynsum.min_length"] = vespalib::make_vespa_string("%d", cfg.minLength); - _properties["juniper.dynsum.surround_max"] = vespalib::make_vespa_string("%d", cfg.surroundMax); - _properties["juniper.matcher.winsize"] = vespalib::make_vespa_string("%d", cfg.winsize); - _properties["juniper.matcher.winsize_fallback_multiplier"] = vespalib::make_vespa_string("%f", cfg.winsizeFallbackMultiplier); - _properties["juniper.matcher.max_match_candidates"] = vespalib::make_vespa_string("%d", cfg.maxMatchCandidates); - _properties["juniper.stem.min_length"] = vespalib::make_vespa_string("%d", cfg.stemMinLength); - _properties["juniper.stem.max_extend"] = vespalib::make_vespa_string("%d", cfg.stemMaxExtend); + _properties["juniper.dynsum.length"] = make_string("%d", cfg.length); + _properties["juniper.dynsum.max_matches"] = make_string("%d", cfg.maxMatches); + _properties["juniper.dynsum.min_length"] = make_string("%d", cfg.minLength); + _properties["juniper.dynsum.surround_max"] = make_string("%d", cfg.surroundMax); + _properties["juniper.matcher.winsize"] = make_string("%d", cfg.winsize); + _properties["juniper.matcher.winsize_fallback_multiplier"] = make_string("%f", cfg.winsizeFallbackMultiplier); + _properties["juniper.matcher.max_match_candidates"] = make_string("%d", cfg.maxMatchCandidates); + _properties["juniper.stem.min_length"] = make_string("%d", cfg.stemMinLength); + _properties["juniper.stem.max_extend"] = make_string("%d", cfg.stemMaxExtend); for (uint32_t i = 0; i < cfg.override.size(); ++i) { const JuniperrcConfig::Override &override = cfg.override[i]; - const vespalib::string keyDynsum = vespalib::make_vespa_string("%s.dynsum.", override.fieldname.c_str()); - const vespalib::string keyMatcher = vespalib::make_vespa_string("%s.matcher.", override.fieldname.c_str()); - const vespalib::string keyStem = vespalib::make_vespa_string("%s.stem.", override.fieldname.c_str()); + const vespalib::string keyDynsum = make_string("%s.dynsum.", override.fieldname.c_str()); + const vespalib::string keyMatcher = make_string("%s.matcher.", override.fieldname.c_str()); + const vespalib::string keyStem = make_string("%s.stem.", override.fieldname.c_str()); _properties[keyDynsum + "fallback"] = override.prefix ? "prefix" : "none"; - _properties[keyDynsum + "length"] = vespalib::make_vespa_string("%d", override.length); - _properties[keyDynsum + "max_matches"] = vespalib::make_vespa_string("%d", override.maxMatches); - _properties[keyDynsum + "min_length"] = vespalib::make_vespa_string("%d", override.minLength); - _properties[keyDynsum + "surround_max"] = vespalib::make_vespa_string("%d", override.surroundMax); + _properties[keyDynsum + "length"] = make_string("%d", override.length); + _properties[keyDynsum + "max_matches"] = make_string("%d", override.maxMatches); + _properties[keyDynsum + "min_length"] = make_string("%d", override.minLength); + _properties[keyDynsum + "surround_max"] = make_string("%d", override.surroundMax); - _properties[keyMatcher + "winsize"] = vespalib::make_vespa_string("%d", override.winsize); - _properties[keyMatcher + "winsize_fallback_multiplier"] = vespalib::make_vespa_string("%f", override.winsizeFallbackMultiplier); - _properties[keyMatcher + "max_match_candidates"] = vespalib::make_vespa_string("%d", override.maxMatchCandidates); + _properties[keyMatcher + "winsize"] = make_string("%d", override.winsize); + _properties[keyMatcher + "winsize_fallback_multiplier"] = make_string("%f", override.winsizeFallbackMultiplier); + _properties[keyMatcher + "max_match_candidates"] = make_string("%d", override.maxMatchCandidates); - _properties[keyStem + "min_length"] = vespalib::make_vespa_string("%d", override.stemMinLength); - _properties[keyStem + "max_extend"] = vespalib::make_vespa_string("%d", override.stemMaxExtend); + _properties[keyStem + "min_length"] = make_string("%d", override.stemMinLength); + _properties[keyStem + "max_extend"] = make_string("%d", override.stemMaxExtend); } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp index 88cc784f9d1..5b38a00fa3b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp @@ -1,13 +1,10 @@ // 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/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/searchlib/util/rawbuf.h> #include "docsumstate.h" #include "keywordextractor.h" #include "idocsumenvironment.h" +#include <vespa/searchlib/parsequery/stackdumpiterator.h> +#include <vespa/searchlib/util/rawbuf.h> /** Tell us what parts of the query we are interested in */ diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp index 07c82382233..629bd37b155 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/common/featureset.h> -#include <vespa/searchlib/common/packets.h> #include "rankfeaturesdfw.h" -#include <vespa/searchlib/common/feature.h> #include "docsumformat.h" #include "docsumstate.h" +#include <vespa/searchlib/common/feature.h> +#include <vespa/searchlib/common/featureset.h> +#include <vespa/searchlib/common/packets.h> #include <vespa/vespalib/data/slime/cursor.h> namespace search { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp index ed5f41fcdd8..9c28861eee6 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp @@ -1,6 +1,4 @@ // 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 "resultclass.h" diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp index bda2f5c1b74..292bb165893 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp @@ -1,11 +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/log/log.h> +#include "resultpacker.h" #include <vespa/searchcommon/common/undefinedvalues.h> -#include <vespa/searchsummary/docsummary/resultpacker.h> +#include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.resultpacker"); namespace search { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp index 66e50fdff1a..758162f5e97 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/common/featureset.h> -#include <vespa/searchlib/common/packets.h> #include "docsumformat.h" #include "summaryfeaturesdfw.h" #include "docsumstate.h" +#include <vespa/searchlib/common/featureset.h> +#include <vespa/searchlib/common/packets.h> #include <vespa/vespalib/data/slime/cursor.h> #include <cmath> diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp index 716c4a024d8..67a7f9e8da6 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "tokenizer.h" #include "textextractordfw.h" #include "docsumstate.h" + #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.textextractordfw"); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp index 61a0f8cdfdd..6e0c018950d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".summary.tokenizer"); #include "tokenizer.h" +#include <cassert> namespace search { namespace docsummary { @@ -103,7 +101,7 @@ Tokenizer::getNextToken() _pos = next; } - LOG_ASSERT(_pos == _end); + assert(_pos == _end); _hasMoreTokens = false; return Token(textBegin, _pos, _type); // return the last token } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp index c895b2a52b1..0d3a212fc1f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp @@ -1,13 +1,10 @@ // 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 <vespa/searchsummary/docsummary/urlresult.h> -#include <vespa/searchsummary/docsummary/resultconfig.h> +#include "urlresult.h" +#include "resultconfig.h" #include <zlib.h> +#include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.urlresult"); namespace search { @@ -17,12 +14,10 @@ urlresult::urlresult(uint32_t partition, uint32_t docid, HitRank metric) : _partition(partition), _docid(docid), _metric(metric) -{} +{ } -urlresult::~urlresult() -{ -} +urlresult::~urlresult() { } /*===============================================================*/ @@ -30,16 +25,15 @@ urlresult::~urlresult() badurlresult::badurlresult() : urlresult(0, 0, 0) -{} +{ } badurlresult::badurlresult(uint32_t partition, uint32_t docid, HitRank metric) : urlresult(partition, docid, metric) -{} +{ } -badurlresult::~badurlresult() -{} +badurlresult::~badurlresult() { } int |