Fix move ctor for database and accidental delete

CERT-Polska · Dec 24, 2022 · 6fe18ec · 6fe18ec
1 parent 1462971
commit 6fe18ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/libursa/OnDiskDataset.h b/libursa/OnDiskDataset.h
@@ -31,6 +31,8 @@ class NgramProfile {
     NgramProfile() : profiles() {}
     NgramProfile(std::map<IndexType, std::vector<uint64_t>> &&profiles)
         : profiles(std::move(profiles)) {}
+    NgramProfile &operator=(NgramProfile &&other) = default;
+    NgramProfile(NgramProfile &&other) = default;
     NgramProfile(const NgramProfile &other) = delete;
 
     // Returns the size in bytes of data for a given ngram.

diff --git a/libursa/Query.h b/libursa/Query.h
@@ -24,6 +24,10 @@ class PrimitiveQuery {
 
     IndexType itype;
     TriGram trigram;
+
+    // We want to use PrimitiveQuery in STL containers, and this means they
+    // must be comparable using <. Specific order doesn't matter.
+    bool operator<(const PrimitiveQuery &rhs) const;
 };
 
 using QueryPrimitive =