diff options
-rw-r--r-- | metrics/src/vespa/metrics/valuemetric.h | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp | 6 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/metrics/src/vespa/metrics/valuemetric.h b/metrics/src/vespa/metrics/valuemetric.h index 1766c92e680..81edca7ac16 100644 --- a/metrics/src/vespa/metrics/valuemetric.h +++ b/metrics/src/vespa/metrics/valuemetric.h @@ -15,6 +15,7 @@ #include "valuemetricvalues.h" #include "metric.h" +#include <cmath> namespace metrics { diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp index 2e2a7f13fae..2c375fce6d5 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp @@ -26,7 +26,7 @@ struct Pair { } }; -} // namespace anon +} namespace proton { @@ -615,7 +615,6 @@ RPCHooksBase::finiSession(FRT_RPCRequest *req) delete sessionspp; } - void RPCHooksBase::downSession(FRT_RPCRequest *req) { @@ -627,7 +626,6 @@ RPCHooksBase::downSession(FRT_RPCRequest *req) getSession(req)->setDown(); } - void RPCHooksBase::mismatch(FRT_RPCRequest *req) { @@ -642,4 +640,4 @@ RPCHooks::RPCHooks(Params ¶ms) : open(params); } -} // namespace proton +} diff --git a/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp b/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp index 12f85effb2c..9b71c069cb7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp @@ -1,16 +1,15 @@ // 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/log/log.h> -LOG_SETUP(".proton.server.simpleflush"); - #include "simpleflush.h" #include <algorithm> +#include <vespa/log/log.h> +LOG_SETUP(".proton.server.simpleflush"); + namespace proton { SimpleFlush::SimpleFlush() { - // empty } FlushContext::List |