diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenserver/main.cpp | 2 | ||||
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 3 | ||||
| -rw-r--r-- | src/zenstore/projectstore.cpp | 3 | ||||
| -rw-r--r-- | src/zenstore/referencemetadata.cpp (renamed from src/zenutil/referencemetadata.cpp) | 2 | ||||
| -rw-r--r-- | src/zenstore/referencemetadata.h (renamed from src/zenutil/include/zenutil/referencemetadata.h) | 0 | ||||
| -rw-r--r-- | src/zenutil/include/zenutil/windows/windowsservice.h (renamed from src/zenutil/include/zenutil/windows/service.h) | 0 | ||||
| -rw-r--r-- | src/zenutil/service.cpp | 2 | ||||
| -rw-r--r-- | src/zenutil/windows/windowsservice.cpp (renamed from src/zenutil/windows/service.cpp) | 2 |
8 files changed, 8 insertions, 6 deletions
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp index d512d4894..a91c95ffb 100644 --- a/src/zenserver/main.cpp +++ b/src/zenserver/main.cpp @@ -31,7 +31,7 @@ #if ZEN_PLATFORM_WINDOWS # include <zencore/windows.h> -# include <zenutil/windows/service.h> +# include <zenutil/windows/windowsservice.h> #endif ////////////////////////////////////////////////////////////////////////// diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp index fd92dfa5a..c2e811003 100644 --- a/src/zenstore/cache/cachedisklayer.cpp +++ b/src/zenstore/cache/cachedisklayer.cpp @@ -15,9 +15,10 @@ #include <zencore/trace.h> #include <zencore/workthreadpool.h> #include <zencore/xxhash.h> -#include <zenutil/referencemetadata.h> #include <zenutil/workerpools.h> +#include "../referencemetadata.h" + #include <future> #include <limits> diff --git a/src/zenstore/projectstore.cpp b/src/zenstore/projectstore.cpp index f23a669b5..8ae74c8cf 100644 --- a/src/zenstore/projectstore.cpp +++ b/src/zenstore/projectstore.cpp @@ -18,9 +18,10 @@ #include <zenstore/caslog.h> #include <zenstore/cidstore.h> #include <zenstore/scrubcontext.h> -#include <zenutil/referencemetadata.h> #include <zenutil/workerpools.h> +#include "referencemetadata.h" + ZEN_THIRD_PARTY_INCLUDES_START #include <tsl/robin_set.h> #include <xxh3.h> diff --git a/src/zenutil/referencemetadata.cpp b/src/zenstore/referencemetadata.cpp index bbcafcfba..e202b435b 100644 --- a/src/zenutil/referencemetadata.cpp +++ b/src/zenstore/referencemetadata.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include <zenutil/referencemetadata.h> +#include "referencemetadata.h" ////////////////////////////////////////////////////////////////////////// #include <zencore/xxhash.h> diff --git a/src/zenutil/include/zenutil/referencemetadata.h b/src/zenstore/referencemetadata.h index 5160bfb8b..5160bfb8b 100644 --- a/src/zenutil/include/zenutil/referencemetadata.h +++ b/src/zenstore/referencemetadata.h diff --git a/src/zenutil/include/zenutil/windows/service.h b/src/zenutil/include/zenutil/windows/windowsservice.h index ca0270a36..ca0270a36 100644 --- a/src/zenutil/include/zenutil/windows/service.h +++ b/src/zenutil/include/zenutil/windows/windowsservice.h diff --git a/src/zenutil/service.cpp b/src/zenutil/service.cpp index e4a9a951e..103fdaa2f 100644 --- a/src/zenutil/service.cpp +++ b/src/zenutil/service.cpp @@ -10,7 +10,7 @@ #if ZEN_PLATFORM_WINDOWS # include <zencore/windows.h> -# include <zenutil/windows/service.h> +# include <zenutil/windows/windowsservice.h> #endif #if ZEN_PLATFORM_MAC # include <zencore/filesystem.h> diff --git a/src/zenutil/windows/service.cpp b/src/zenutil/windows/windowsservice.cpp index b76ed7a66..ebb88b018 100644 --- a/src/zenutil/windows/service.cpp +++ b/src/zenutil/windows/windowsservice.cpp @@ -3,7 +3,7 @@ #include <zencore/zencore.h> #if ZEN_PLATFORM_WINDOWS -# include <zenutil/windows/service.h> +# include <zenutil/windows/windowsservice.h> # include <zencore/except.h> # include <zencore/thread.h> |