1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
|
From: Lucas van Dijk <info@lucasvandijk.nl>
Date: Wed, 13 May 2020 16:35:47 -0400
Subject: Fix compilation error with custom unitig data
Forwarded: yes, https://github.com/pmelsted/bifrost/pull/18
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1096367
---
src/DataStorage.hpp | 2 ++
src/DataStorage.tcc | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/DataStorage.hpp b/src/DataStorage.hpp
index 568808d..e96a586 100755
--- a/src/DataStorage.hpp
+++ b/src/DataStorage.hpp
@@ -65,6 +65,8 @@ class DataStorage {
inline size_t getNbColors() const { return color_names.size(); }
+ inline vector<string> const& getColorNames() const { return color_names; }
+
size_t getUnitigColorsSize(const size_t nb_threads = 1) const;
uint64_t getHash(const UnitigColorMap<U>& um) const;
diff --git a/src/DataStorage.tcc b/src/DataStorage.tcc
index 22967c9..1a485dc 100755
--- a/src/DataStorage.tcc
+++ b/src/DataStorage.tcc
@@ -78,7 +78,7 @@ DataStorage<U>::DataStorage(const DataStorage& o) : color_sets(nullptr), shared_
unitig_cs_link = new atomic<uint64_t>[sz_link];
- for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.sz_link[i].load();
+ for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.unitig_cs_link[i].load();
}
if ((o.data != nullptr) && (o.sz_cs != 0)){
|