diff options
| author | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
| commit | b6c6568e1618f10d2160d836b65e35586e3c740f (patch) | |
| tree | f6a929cf918850bbba87d0ee67cd3482b2d50e24 /zenserver/upstream/upstreamapply.cpp | |
| parent | Fixed bug in z$ service returning partial cache records and enable small obje... (diff) | |
| parent | Partial revert b363c5b (diff) | |
| download | zen-b6c6568e1618f10d2160d836b65e35586e3c740f.tar.xz zen-b6c6568e1618f10d2160d836b65e35586e3c740f.zip | |
Merged main.
Diffstat (limited to 'zenserver/upstream/upstreamapply.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamapply.cpp | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp index 05be5f65c..f8a8c3e62 100644 --- a/zenserver/upstream/upstreamapply.cpp +++ b/zenserver/upstream/upstreamapply.cpp @@ -1,37 +1,40 @@ // Copyright Epic Games, Inc. All Rights Reserved. #include "upstreamapply.h" -#include "jupiter.h" -#include "zen.h" - -#include <zencore/blockingqueue.h> -#include <zencore/compactbinary.h> -#include <zencore/compactbinarybuilder.h> -#include <zencore/compactbinarypackage.h> -#include <zencore/compactbinaryvalidation.h> -#include <zencore/compress.h> -#include <zencore/fmtutils.h> -#include <zencore/session.h> -#include <zencore/stats.h> -#include <zencore/stream.h> -#include <zencore/thread.h> -#include <zencore/timer.h> - -#include <zenstore/cas.h> -#include <zenstore/cidstore.h> - -#include "cache/structuredcachestore.h" -#include "diag/logging.h" - -#include <fmt/format.h> - -#include <algorithm> -#include <atomic> -#include <map> -#include <set> -#include <stack> -#include <thread> -#include <unordered_map> + +#if ZEN_WITH_COMPUTE_SERVICES + +# include "jupiter.h" +# include "zen.h" + +# include <zencore/blockingqueue.h> +# include <zencore/compactbinary.h> +# include <zencore/compactbinarybuilder.h> +# include <zencore/compactbinarypackage.h> +# include <zencore/compactbinaryvalidation.h> +# include <zencore/compress.h> +# include <zencore/fmtutils.h> +# include <zencore/session.h> +# include <zencore/stats.h> +# include <zencore/stream.h> +# include <zencore/thread.h> +# include <zencore/timer.h> + +# include <zenstore/cas.h> +# include <zenstore/cidstore.h> + +# include "cache/structuredcachestore.h" +# include "diag/logging.h" + +# include <fmt/format.h> + +# include <algorithm> +# include <atomic> +# include <map> +# include <set> +# include <stack> +# include <thread> +# include <unordered_map> namespace zen { @@ -1569,3 +1572,5 @@ MakeHordeUpstreamEndpoint(const CloudCacheClientOptions& Options, CasStore& CasS } } // namespace zen + +#endif // ZEN_WITH_COMPUTE_SERVICES |