aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2021-11-11 15:08:02 +0100
committerPer Larsson <[email protected]>2021-11-11 15:08:02 +0100
commitca91bd3945fa9e93b48cad72a1bca910badfd940 (patch)
tree7ab365be18496a9f127f4e2ebebd465547b15d90
parentRenamed 3rdparty -> thirdparty for legal compliance (diff)
downloadzen-ca91bd3945fa9e93b48cad72a1bca910badfd940.tar.xz
zen-ca91bd3945fa9e93b48cad72a1bca910badfd940.zip
Format fix.
-rw-r--r--zencore/compactbinary.cpp6
-rw-r--r--zencore/memory.cpp4
-rw-r--r--zenserver-test/zenserver-test.cpp12
-rw-r--r--zenserver/cache/structuredcachestore.cpp15
-rw-r--r--zenserver/cache/structuredcachestore.h6
5 files changed, 25 insertions, 18 deletions
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index ec549a3e9..c6bf38b04 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -1855,7 +1855,7 @@ TEST_CASE("uson.json")
CbObject Obj = Writer.Save();
StringBuilder<128> Sb;
- const char* JsonText = Obj.ToJson(Sb).Data();
+ const char* JsonText = Obj.ToJson(Sb).Data();
std::string JsonError;
json11::Json Json = json11::Json::parse(JsonText, JsonError);
@@ -1880,7 +1880,7 @@ TEST_CASE("uson.json")
CbObject Obj = Writer.Save();
StringBuilder<128> Sb;
- const char* JsonText = Obj.ToJson(Sb).Data();
+ const char* JsonText = Obj.ToJson(Sb).Data();
std::string JsonError;
json11::Json Json = json11::Json::parse(JsonText, JsonError);
@@ -1905,7 +1905,7 @@ TEST_CASE("uson.json")
CbObject Obj = Writer.Save();
StringBuilder<128> Sb;
- const char* JsonText = Obj.ToJson(Sb).Data();
+ const char* JsonText = Obj.ToJson(Sb).Data();
std::string JsonError;
json11::Json Json = json11::Json::parse(JsonText, JsonError);
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index 14ea7ca1d..c94829276 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -186,13 +186,13 @@ TEST_CASE("MemoryView")
{
{
uint8_t Array1[16] = {};
- MemoryView View1 = MakeMemoryView(Array1);
+ MemoryView View1 = MakeMemoryView(Array1);
CHECK(View1.GetSize() == 16);
}
{
uint32_t Array2[16] = {};
- MemoryView View2 = MakeMemoryView(Array2);
+ MemoryView View2 = MakeMemoryView(Array2);
CHECK(View2.GetSize() == 64);
}
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 52648efcc..3d190112b 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -464,7 +464,9 @@ using namespace std::literals;
class full_test_formatter final : public spdlog::formatter
{
public:
- full_test_formatter(std::string_view LogId, std::chrono::time_point<std::chrono::system_clock> Epoch) : m_Epoch(Epoch), m_LogId(LogId) {}
+ full_test_formatter(std::string_view LogId, std::chrono::time_point<std::chrono::system_clock> Epoch) : m_Epoch(Epoch), m_LogId(LogId)
+ {
+ }
virtual std::unique_ptr<formatter> clone() const override { return std::make_unique<full_test_formatter>(m_LogId, m_Epoch); }
@@ -1705,8 +1707,8 @@ TEST_CASE("zcache.policy")
LocalCfg.Spawn(LocalInst);
- zen::IoHash Key;
- zen::IoHash PayloadId;
+ zen::IoHash Key;
+ zen::IoHash PayloadId;
// Store package locally
{
@@ -1763,8 +1765,8 @@ TEST_CASE("zcache.policy")
UpstreamCfg.Spawn(UpstreamInst);
LocalCfg.Spawn(LocalInst);
- zen::IoHash Key;
- zen::IoHash PayloadId;
+ zen::IoHash Key;
+ zen::IoHash PayloadId;
// Store package upstream
{
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 119062833..8b9ce8ff9 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -325,27 +325,32 @@ inline DiskLocation::DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t
{
}
-inline uint64_t DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags)
+inline uint64_t
+DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags)
{
return Offset | Flags;
}
-inline uint64_t DiskLocation::Offset() const
+inline uint64_t
+DiskLocation::Offset() const
{
return OffsetAndFlags & kOffsetMask;
}
-inline uint64_t DiskLocation::Size() const
+inline uint64_t
+DiskLocation::Size() const
{
return LowerSize;
}
-inline uint64_t DiskLocation::IsFlagSet(uint64_t Flag) const
+inline uint64_t
+DiskLocation::IsFlagSet(uint64_t Flag) const
{
return OffsetAndFlags & Flag;
}
-inline ZenContentType DiskLocation::GetContentType() const
+inline ZenContentType
+DiskLocation::GetContentType() const
{
ZenContentType ContentType = ZenContentType::kBinary;
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h
index 6521d8393..0dfcbc5ca 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/zenserver/cache/structuredcachestore.h
@@ -112,9 +112,9 @@ struct DiskLocation
static const uint64_t kStructured = 0x4000'0000'0000'0000ull;
static const uint64_t kTombStone = 0x2000'0000'0000'0000ull;
- DiskLocation();
- DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags);
- static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags);
+ DiskLocation();
+ DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags);
+ static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags);
uint64_t Offset() const;
uint64_t Size() const;
uint64_t IsFlagSet(uint64_t Flag) const;