X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fstructures%2Fset.h;h=70b19b0c3ae82dddd115e97f63c7e5052992350f;hb=7d0b5833568389c06ff6d9871da343a1e3e374fe;hp=3215080f66c9465ad53a4d93b811f0c337cb6c0b;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git diff --git a/nucleus/library/structures/set.h b/nucleus/library/structures/set.h index 3215080f..70b19b0c 100644 --- a/nucleus/library/structures/set.h +++ b/nucleus/library/structures/set.h @@ -38,7 +38,7 @@ public: //! Constructs a set with "num" elements, copying them from "init". /*! Be very careful to ensure that the array "init" has sufficient length for "num" elements to be copied from it. */ - set(int num = 0, const contents *init = NIL, + set(int num = 0, const contents *init = NULL_POINTER, basis::un_short flags = basis::array::EXPONE) : basis::array(num, init, flags) {} @@ -232,7 +232,7 @@ template bool set::add(const contents &to_add) { if (member(to_add)) return false; - concatenate(to_add); + this->concatenate(to_add); return true; } @@ -259,7 +259,7 @@ bool set::remove(const contents &to_remove) template set set::intersection(const set &intersect_with) const { - set created(0, NIL, this->flags()); + set created(0, NULL_POINTER, this->flags()); const set *smaller = this; const set *larger = &intersect_with; if (elements() > intersect_with.elements()) {