Do not carry exceptions in header files

5 files changed, 12 insertions, 12 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
index 0f8b2b0518a..31ac8f67afe 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
@@ -7,6 +7,7 @@
 #include "attributefile.h"
 #include "interlock.h"
 #include <vespa/vespalib/stllike/hash_map.hpp>
+#include <vespa/vespalib/util/exceptions.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.attributemanager");
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index c3a2a794ff0..2432851c481 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -17,6 +17,7 @@
 #include <vespa/document/update/mapvalueupdate.h>
 #include <vespa/fastlib/io/bufferedfile.h>
 #include <vespa/searchlib/query/query.h>
+#include <vespa/vespalib/util/exceptions.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.attribute.attributevector");
diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
index 894dc45472f..2421e46f528 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fusion.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.
 // Copyright (C) 2003 Fast Search & Transfer ASA
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
 #include "fusion.h"
+#include "fieldreader.h"
+#include "fieldwriter.h"
+#include "dictionarywordreader.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/searchlib/common/fslimits.h>
-
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/searchlib/util/dirtraverse.h>
 #include <vespa/vespalib/io/fileutil.h>
@@ -14,10 +14,9 @@
 #include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/searchlib/index/postinglistparams.h>
 #include <vespa/searchlib/util/postingpriorityqueue.h>
-#include "fieldreader.h"
-#include "fieldwriter.h"
-#include "dictionarywordreader.h"
+#include <vespa/vespalib/util/error.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".diskindex.fusion");
 
 using search::FileKit;
diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
index bf688b4766c..888bfcff1e4 100644
--- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/diskindex/fieldwriter.h>
 #include <vespa/vespalib/util/array.hpp>
+#include <vespa/vespalib/util/error.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".diskindex.indexbuilder");
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index b9a9ea57a9e..cc904ef82a7 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -1,18 +1,16 @@
 // 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/searchlib/transactionlog/translogserver.h>
+#include "translogserver.h"
 #include <fstream>
-#include <vespa/vespalib/util/vstringfmt.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <stdexcept>
 #include <vespa/log/log.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/vespalib/util/exceptions.h>
 
 LOG_SETUP(".transactionlog.server");
 
 using vespalib::make_string;
 using vespalib::stringref;
-using vespalib::make_vespa_string;
 using vespalib::IllegalArgumentException;
 using search::common::FileHeaderContext;
 
@@ -414,13 +412,13 @@ void TransLogServer::deleteDomain(FRT_RPCRequest *req)
                 domainDir << it->first << std::endl;
             }
         } catch (const std::exception & e) {
-            msg = make_vespa_string("Failed deleting %s domain. Exception = %s", domainName, e.what());
+            msg = make_string("Failed deleting %s domain. Exception = %s", domainName, e.what());
             retval = -1;
             LOG(warning, "%s", msg.c_str());
         }
     } else {
         retval = -2;
-        msg = vespalib::make_vespa_string("Domain '%s' is open. Can not delete open domains.", domainName);
+        msg = vespalib::make_string("Domain '%s' is open. Can not delete open domains.", domainName);
         LOG(warning, "%s", msg.c_str());
     }
     ret.AddInt32(retval);