Do not provide unnecessary fastos/mutex.h by default.

3 files changed, 7 insertions, 12 deletions

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp
index e2dda337e73..697e2ed6722 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp
@@ -6,12 +6,12 @@
 #include <vespa/vespalib/util/jsonwriter.h>
 #include <vespa/vespalib/data/slime/cursor.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <climits>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.geoposdfw");
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 using attribute::IAttributeVector;
 using attribute::IAttributeContext;
@@ -110,5 +110,3 @@ GeoPositionDFW::create(const char *attribute_name,
 
 
 }
-}
-
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
index 841840d8349..be9517eba03 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
@@ -2,16 +2,15 @@
 
 #include "positionsdfw.h"
 #include "docsumstate.h"
-#include "idocsumenvironment.h"
 #include <vespa/searchlib/common/location.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <cmath>
+#include <climits>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.positionsdfw");
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 using search::attribute::IAttributeContext;
 using search::attribute::IAttributeVector;
@@ -223,5 +222,4 @@ AbsDistanceDFW::UP createAbsDistanceDFW(const char *attribute_name,
     return ret;
 }
 
-}  // namespace docsummary
-}  // namespace search
+}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp
index 0d3a212fc1f..d0beb2bd315 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp
@@ -3,12 +3,12 @@
 #include "urlresult.h"
 #include "resultconfig.h"
 #include <zlib.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.urlresult");
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 urlresult::urlresult(uint32_t partition, uint32_t docid, HitRank metric)
     : _partition(partition),
@@ -811,4 +811,3 @@ GeneralResult::_inplace_unpack(const char *buf, const size_t buflen)
 }
 
 }
-}