From acb8b74bb3aef4def0c18231910f11532ab5053f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 21 Jun 2022 07:26:30 +0000
Subject: Inline return AttrDFW::get_attribute() and clean up some old code
 with manual allocation.

---
 searchlib/src/vespa/searchlib/common/geo_location.h      | 2 +-
 searchlib/src/vespa/searchlib/common/geo_location_spec.h | 2 +-
 searchlib/src/vespa/searchlib/engine/docsumrequest.h     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'searchlib')

diff --git a/searchlib/src/vespa/searchlib/common/geo_location.h b/searchlib/src/vespa/searchlib/common/geo_location.h
index 07e6fd055cc..09c77037b03 100644
--- a/searchlib/src/vespa/searchlib/common/geo_location.h
+++ b/searchlib/src/vespa/searchlib/common/geo_location.h
@@ -2,10 +2,10 @@
 
 #pragma once
 
+#include <vespa/vespalib/geo/zcurve.h>
 #include <string>
 #include <cstdint>
 #include <limits>
-#include <vespa/vespalib/geo/zcurve.h>
 
 namespace search::common {
 
diff --git a/searchlib/src/vespa/searchlib/common/geo_location_spec.h b/searchlib/src/vespa/searchlib/common/geo_location_spec.h
index ea0104aa058..f1e3671181d 100644
--- a/searchlib/src/vespa/searchlib/common/geo_location_spec.h
+++ b/searchlib/src/vespa/searchlib/common/geo_location_spec.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
+#include "geo_location.h"
 #include <string>
 #include <cstdint>
-#include "geo_location.h"
 
 namespace search::common {
 
diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.h b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
index 27fb5b25a96..d4f3a1ec340 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "propertiesmap.h"
 #include "request.h"
 #include "lazy_source.h"
 #include <vespa/document/base/globalid.h>
-- 
cgit v1.2.3