diff options
Diffstat (limited to 'staging_vespalib')
3 files changed, 4 insertions, 4 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/clock.h b/staging_vespalib/src/vespa/vespalib/util/clock.h index 4a5611bbe5a..e17ec962fc9 100644 --- a/staging_vespalib/src/vespa/vespalib/util/clock.h +++ b/staging_vespalib/src/vespa/vespalib/util/clock.h @@ -33,7 +33,7 @@ public: Clock(double timePeriod=0.100); ~Clock(); - fastos::TimeStamp getTimeNS(void) const { + fastos::TimeStamp getTimeNS() const { if (!_running) { setTime(); } @@ -41,7 +41,7 @@ public: } fastos::TimeStamp getTimeNSAssumeRunning() const { return _timeNS; } - void stop(void); + void stop(); }; } diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp index 537b44c49eb..354d2e013ed 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp @@ -1,5 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/util/growablebytebuffer.h> +#include "growablebytebuffer.h" +#include <arpa/inet.h> using namespace vespalib; diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h index fd65f0134bc..fdf090d22f9 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h +++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/types.h> #include <vespa/vespalib/util/memory.h> #include <vespa/vespalib/stllike/string.h> |