diff options
| author | Stefan Boberg <[email protected]> | 2021-05-22 11:40:03 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-05-22 11:40:03 +0200 |
| commit | c0760dafc01a21abffb207a2598b978930d6fcb9 (patch) | |
| tree | 9f2ec1a8e37d98d75e45432572ab31d93f3b07dd | |
| parent | Fixed up PutLargeObject() error handling (diff) | |
| download | zen-c0760dafc01a21abffb207a2598b978930d6fcb9.tar.xz zen-c0760dafc01a21abffb207a2598b978930d6fcb9.zip | |
clang-format
| -rw-r--r-- | zencore/include/zencore/memory.h | 2 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 2 | ||||
| -rw-r--r-- | zenstore/basicfile.cpp | 4 | ||||
| -rw-r--r-- | zenstore/compactcas.h | 2 | ||||
| -rw-r--r-- | zenstore/include/zenstore/basicfile.h | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h index 326e4a498..5851ed137 100644 --- a/zencore/include/zencore/memory.h +++ b/zencore/include/zencore/memory.h @@ -4,8 +4,8 @@ #include "zencore.h" -#include <zencore/thread.h> #include <zencore/intmath.h> +#include <zencore/thread.h> #include <algorithm> #include <vector> diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index c99fa4232..b353a6eac 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -11,9 +11,9 @@ #include <zencore/string.h> #include <zencore/timer.h> #include <zencore/windows.h> +#include <zenstore/basicfile.h> #include <zenstore/cas.h> #include <zenstore/caslog.h> -#include <zenstore/basicfile.h> #pragma comment(lib, "Rpcrt4.lib") // RocksDB made me do this #include <rocksdb/db.h> diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp index 0164a45ee..7f10fc5e6 100644 --- a/zenstore/basicfile.cpp +++ b/zenstore/basicfile.cpp @@ -1,8 +1,10 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + #include "zenstore/basicfile.h" +#include <zencore/except.h> #include <zencore/filesystem.h> #include <zencore/fmtutils.h> -#include <zencore/except.h> #include <fmt/format.h> #include <gsl/gsl-lite.hpp> diff --git a/zenstore/compactcas.h b/zenstore/compactcas.h index 3ce91cc52..db115c85d 100644 --- a/zenstore/compactcas.h +++ b/zenstore/compactcas.h @@ -10,9 +10,9 @@ #include <zencore/thread.h> #include <zencore/uid.h> #include <zencore/windows.h> +#include <zenstore/basicfile.h> #include <zenstore/cas.h> #include <zenstore/caslog.h> -#include <zenstore/basicfile.h> #include <atlfile.h> #include <functional> diff --git a/zenstore/include/zenstore/basicfile.h b/zenstore/include/zenstore/basicfile.h index ac4f48744..b38feb3da 100644 --- a/zenstore/include/zenstore/basicfile.h +++ b/zenstore/include/zenstore/basicfile.h @@ -2,8 +2,8 @@ #pragma once -#include <zencore/zencore.h> #include <zencore/iobuffer.h> +#include <zencore/zencore.h> #include <zencore/windows.h> |