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

4 files changed, 8 insertions, 14 deletions

diff --git a/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp b/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp
index 4344895ad63..f92087f7352 100644
--- a/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp
+++ b/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp
@@ -3,6 +3,7 @@
 #include "indexmetainfo.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/guard.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".indexmetainfo");
diff --git a/searchlib/src/vespa/searchlib/features/random_normal_feature.cpp b/searchlib/src/vespa/searchlib/features/random_normal_feature.cpp
index 127dd0feecf..44bbe0db6e3 100644
--- a/searchlib/src/vespa/searchlib/features/random_normal_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/random_normal_feature.cpp
@@ -21,7 +21,7 @@ RandomNormalExecutor::RandomNormalExecutor(uint64_t seed, double mean, double st
     _spare(0.0)
 
 {
-    LOG(debug, "RandomNormalExecutor: seed=%" PRIu64 ", mean=%f, stddev=%f", seed, mean, stddev);
+    LOG(debug, "RandomNormalExecutor: seed=%zu, mean=%f, stddev=%f", seed, mean, stddev);
     _rnd.srand48(seed);
 }
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
index c6f7928f4d0..9b9c8eaaa3e 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
@@ -3,10 +3,9 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
-#include <vespa/vespalib/util/exceptions.h>
+#include <climits>
 
-namespace search {
-namespace predicate {
+namespace search::predicate {
 
 /**
  * Helper class for expanding a point in a predicate range query to
@@ -92,7 +91,4 @@ void PredicateRangeTermExpander::expand(const vespalib::string &key, int64_t sig
     }
 }
 
-
-}  // namespace search::predicate
-}  // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/util/filesizecalculator.cpp b/searchlib/src/vespa/searchlib/util/filesizecalculator.cpp
index 342ccb0104e..4be1eb668c9 100644
--- a/searchlib/src/vespa/searchlib/util/filesizecalculator.cpp
+++ b/searchlib/src/vespa/searchlib/util/filesizecalculator.cpp
@@ -31,22 +31,19 @@ FileSizeCalculator::extractFileSize(const vespalib::GenericHeader &header,
     uint64_t fileByteSize = fileBitSize / 8;
     if (!byteAligned(fileBitSize)) {
         LOG(error,
-            "Bad header file size tag for %s, fileBitSize=%" PRIu64
-            " which is not a multiple of 8",
+            "Bad header file size tag for %s, fileBitSize=%zu which is not a multiple of 8",
             fileName.c_str(), fileBitSize);
         return false;
     }
     if (fileByteSize < headerLen) {
         LOG(error,
-            "Bad header file size tag for %s, fileBitSize=%" PRIu64
-            " but header is %" PRIu64 "bits",
+            "Bad header file size tag for %s, fileBitSize=%zu but header is %zu bits",
             fileName.c_str(), fileBitSize, headerLen * 8);
         return false;
     }
     if (fileByteSize > fileSize) {
         LOG(error,
-            "Bad header file size tag for %s, fileBitSize=%" PRIu64
-            " but whole file size is %" PRIu64 "bits",
+            "Bad header file size tag for %s, fileBitSize=%zu but whole file size is %zu bits",
             fileName.c_str(), fileBitSize, fileSize * 8);
         return false;
     }