aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-05-20 15:12:26 +0200
committerStefan Boberg <[email protected]>2021-05-20 15:12:26 +0200
commita8f2f071c8240d761b9d9d4fa17f6e48986388aa (patch)
treef3f88d7a45347b51943c2a338089e0287de7ceca
parentMerge branch 'main' of https://github.com/EpicGames/zen (diff)
downloadzen-a8f2f071c8240d761b9d9d4fa17f6e48986388aa.tar.xz
zen-a8f2f071c8240d761b9d9d4fa17f6e48986388aa.zip
Fixed mis-merge
-rw-r--r--zenserver/upstream/jupiter.cpp11
-rw-r--r--zenserver/upstream/jupiter.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 1078e5240..363ebcd61 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -159,17 +159,6 @@ CloudCacheSession::Get(std::string_view BucketId, const IoHash& Key)
return Get(BucketId, KeyString);
}
-void
-CloudCacheSession::Put(std::string_view BucketId, const IoHash& Key, IoBuffer Data, HttpContentType ContentType)
-{
- ZEN_UNUSED(ContentType);
-
- StringBuilder<64> KeyString;
- Key.ToHexString(KeyString);
-
- return Put(BucketId, KeyString, Data);
-}
-
//////////////////////////////////////////////////////////////////////////
std::string
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index 2f01b7afb..a0dbefa3c 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -56,7 +56,7 @@ public:
// Structured cache operations
IoBuffer Get(std::string_view BucketId, const IoHash& Key);
- void Put(std::string_view BucketId, const IoHash& Key, IoBuffer Data, HttpContentType ContentType);
+ void Put(std::string_view BucketId, std::string_view Key, CbObjectView Data);
std::vector<IoHash> Filter(std::string_view BucketId, const std::vector<IoHash>& ChunkHashes);