From e318b4879b7ff6a42bfddff0cb783c491f3261a0 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sun, 5 Nov 2017 16:36:11 +0000 Subject: [PATCH] Fix CI build --- .circleci/config.yml | 2 +- src/blockstore/implementations/caching/cache/CacheEntry.h | 2 +- src/blockstore/implementations/integrity/ClientIdAndBlockId.h | 2 +- test/cpp-utils/EitherTest.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80cde1d1..990c5572 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ references: sudo chmod o-w /etc/apt/sources.list.d/clang.list DEBIAN_FRONTEND=noninteractive sudo apt-get update -qq - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git ccache $APT_COMPILER_PACKAGE cmake make libcurl4-openssl-dev libcrypto++-dev libssl-dev libfuse-dev python clang-tidy + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git ccache $APT_COMPILER_PACKAGE cmake make libcurl4-openssl-dev libcrypto++-dev libssl-dev libfuse-dev python # Use /dev/urandom when /dev/random is accessed to use less entropy sudo cp -a /dev/urandom /dev/random diff --git a/src/blockstore/implementations/caching/cache/CacheEntry.h b/src/blockstore/implementations/caching/cache/CacheEntry.h index 7a5a417d..0af597e2 100644 --- a/src/blockstore/implementations/caching/cache/CacheEntry.h +++ b/src/blockstore/implementations/caching/cache/CacheEntry.h @@ -16,7 +16,7 @@ public: explicit CacheEntry(Value value): _lastAccess(currentTime()), _value(std::move(value)) { } - CacheEntry(CacheEntry &&) noexcept = default; + CacheEntry(CacheEntry&& rhs) noexcept: _lastAccess(std::move(rhs._lastAccess)), _value(std::move(rhs._value)) {} double ageSeconds() const { return ((double)(currentTime() - _lastAccess).total_nanoseconds()) / ((double)1000000000); diff --git a/src/blockstore/implementations/integrity/ClientIdAndBlockId.h b/src/blockstore/implementations/integrity/ClientIdAndBlockId.h index 6b6344e7..12759444 100644 --- a/src/blockstore/implementations/integrity/ClientIdAndBlockId.h +++ b/src/blockstore/implementations/integrity/ClientIdAndBlockId.h @@ -9,7 +9,7 @@ namespace blockstore { namespace integrity { struct ClientIdAndBlockId final { - uint32_t clientId = 0; + uint32_t clientId; BlockId blockId; }; diff --git a/test/cpp-utils/EitherTest.cpp b/test/cpp-utils/EitherTest.cpp index 443f2873..e5555318 100644 --- a/test/cpp-utils/EitherTest.cpp +++ b/test/cpp-utils/EitherTest.cpp @@ -250,7 +250,7 @@ TEST_F(EitherTest, ModifyLeftOpt) { TEST_F(EitherTest, ModifyRightOpt) { either val = string("mystring1"); - val.right_opt().value() = "mystring2"; + val.right_opt().get() = "mystring2"; EXPECT_RIGHT_IS("mystring2", val); }