aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2021-09-22 21:25:28 +0200
committerPer Larsson <[email protected]>2021-09-22 21:25:28 +0200
commit13d72dffe5df56480a19e63ccf7ef79b21fbfea5 (patch)
treed0c8707d7f54eaf0101fca9a9a4028b5ce665b20
parentMerge branch 'main' of https://github.com/EpicGames/zen (diff)
downloadzen-13d72dffe5df56480a19e63ccf7ef79b21fbfea5.tar.xz
zen-13d72dffe5df56480a19e63ccf7ef79b21fbfea5.zip
Clang format fix.
-rw-r--r--zenserver/resource.h18
-rw-r--r--zenstore/filecas.h8
2 files changed, 14 insertions, 12 deletions
diff --git a/zenserver/resource.h b/zenserver/resource.h
index 9a3baf71c..f2e3b471b 100644
--- a/zenserver/resource.h
+++ b/zenserver/resource.h
@@ -1,16 +1,18 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by zenserver.rc
//
-#define IDI_ICON1 101
+#define IDI_ICON1 101
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 102
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
+# ifndef APSTUDIO_READONLY_SYMBOLS
+# define _APS_NEXT_RESOURCE_VALUE 102
+# define _APS_NEXT_COMMAND_VALUE 40001
+# define _APS_NEXT_CONTROL_VALUE 1001
+# define _APS_NEXT_SYMED_VALUE 101
+# endif
#endif
diff --git a/zenstore/filecas.h b/zenstore/filecas.h
index 51e5fbc98..db21502c6 100644
--- a/zenstore/filecas.h
+++ b/zenstore/filecas.h
@@ -44,15 +44,15 @@ private:
spdlog::logger& m_Log;
spdlog::logger& Log() { return m_Log; }
- inline RwLock& LockForHash(const IoHash& Hash) { return m_ShardLocks[Hash.Hash[19]]; }
- void IterateChunks(std::function<void(const IoHash& Hash, BasicFile& PayloadFile)>&& Callback);
- void DeleteChunk(const IoHash& ChunkHash, std::error_code& Ec);
+ inline RwLock& LockForHash(const IoHash& Hash) { return m_ShardLocks[Hash.Hash[19]]; }
+ void IterateChunks(std::function<void(const IoHash& Hash, BasicFile& PayloadFile)>&& Callback);
+ void DeleteChunk(const IoHash& ChunkHash, std::error_code& Ec);
struct ShardingHelper
{
ShardingHelper(const std::filesystem::path& RootPath, const IoHash& ChunkHash);
- size_t Shard2len = 0;
+ size_t Shard2len = 0;
ExtendableWideStringBuilder<128> ShardedPath;
};
};