aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/content-address.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore/content-address.hh')
-rw-r--r--src/libstore/content-address.hh14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh
index 64d514751..ba4797f5b 100644
--- a/src/libstore/content-address.hh
+++ b/src/libstore/content-address.hh
@@ -12,22 +12,12 @@ enum struct FileIngestionMethod : uint8_t {
struct TextHash {
Hash hash;
- TextHash(const TextHash &) = default;
- TextHash(TextHash &&) = default;
- TextHash & operator = (const TextHash &) = default;
};
/// Pair of a hash, and how the file system was ingested
-struct FileSystemHash {
+struct FixedOutputHash {
FileIngestionMethod method;
Hash hash;
- FileSystemHash(FileIngestionMethod method, Hash hash)
- : method(std::move(method))
- , hash(std::move(hash))
- { }
- FileSystemHash(const FileSystemHash &) = default;
- FileSystemHash(FileSystemHash &&) = default;
- FileSystemHash & operator = (const FileSystemHash &) = default;
std::string printMethodAlgo() const;
};
@@ -44,7 +34,7 @@ struct FileSystemHash {
*/
typedef std::variant<
TextHash, // for paths computed by makeTextPath() / addTextToStore
- FileSystemHash // for path computed by makeFixedOutputPath
+ FixedOutputHash // for path computed by makeFixedOutputPath
> ContentAddress;
/* Compute the prefix to the hash algorithm which indicates how the files were