boost::scoped_array -> std::vector

4 files changed, 7 insertions, 11 deletions

diff --git a/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp b/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp
index b944e7ebbb9..954c8639bad 100644
--- a/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp
+++ b/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp
@@ -35,13 +35,14 @@ void filedistribution::logfwd::log_forward(LogLevel level, const char* file, int
 
     if (logger.wants(vespaLogLevel)) {
         const size_t maxSize(0x8000);
-        boost::scoped_array<char> payload(new char[maxSize]);
+        std::vector<char> payload(maxSize);
+        char * buf = &payload[0];
 
         va_list args;
         va_start(args, fmt);
-        vsnprintf(payload.get(), maxSize, fmt, args);
+        vsnprintf(buf, maxSize, fmt, args);
         va_end(args);
 
-        logger.doLog(vespaLogLevel, file, line, "%s", payload.get());
+        logger.doLog(vespaLogLevel, file, line, "%s", buf);
     }
 }
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp
index 5e09073f8a2..d90777455c2 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp
@@ -10,7 +10,6 @@
 #include <cstdio>
 #include <sstream>
 #include <thread>
-#include <boost/throw_exception.hpp>
 #include <boost/function_output_iterator.hpp>
 
 #include <zookeeper/zookeeper.h>
diff --git a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
index 6579ea06f31..26f12cba578 100644
--- a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
+++ b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
@@ -3,7 +3,6 @@
 #include "filedistributorrpc.h"
 
 #include <boost/optional.hpp>
-#include <boost/exception/diagnostic_information.hpp>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".filedistributorrpc");
@@ -222,8 +221,7 @@ FileDistributorRPC::Server::waitFor(FRT_RPCRequest* request) {
         frtstream::FrtServerStream requestHandler(request);
         std::string fileReference;
         requestHandler >> fileReference;
-        boost::optional<fs::path> path
-            = _fileProvider->getPath(fileReference);
+        boost::optional<fs::path> path = _fileProvider->getPath(fileReference);
         if (path) {
             LOG(debug, "Returning request for file reference '%s'.", fileReference.c_str());
             requestHandler << path->string();
@@ -238,9 +236,8 @@ FileDistributorRPC::Server::waitFor(FRT_RPCRequest* request) {
                           "No such file reference");
         request->Return();
     } catch (const std::exception& e) {
-        LOG(error, "An exception occurred while calling the rpc method waitFor:%s",
-            boost::diagnostic_information(e).c_str());
-        request->SetError(RPCErrorCodes::unknownError, boost::diagnostic_information(e).c_str());
+        LOG(error, "An exception occurred while calling the rpc method waitFor:%s", e.what());
+        request->SetError(RPCErrorCodes::unknownError, e.what());
         request->Return(); //the request might be detached.
     }
 }
diff --git a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
index 3c780bf5878..95a7d6113a0 100644
--- a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
+++ b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/enable_shared_from_this.hpp>
 
 #include "fileprovider.h"