Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 04:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move probabilistic code into zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:48:36 -07:00
parent be92bd536f
commit f310795d79
17 changed files with 162 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/OpaqueVal.h
View file

@ -14,10 +14,8 @@
namespace broker { class data; }
namespace probabilistic {
class BloomFilter;
class CardinalityCounter;
}
ZEEK_FORWARD_DECLARE_NAMESPACED(BloomFilter, zeek, probabilistic);
ZEEK_FORWARD_DECLARE_NAMESPACED(CardinalityCounter, zeek, probabilistic, detail);
namespace zeek {
@ -306,7 +304,7 @@ private:
class BloomFilterVal : public OpaqueVal {
public:
explicit BloomFilterVal(probabilistic::BloomFilter* bf);
explicit BloomFilterVal(zeek::probabilistic::BloomFilter* bf);
~BloomFilterVal() override;
ValPtr DoClone(CloneState* state) override;
@ -337,13 +335,13 @@ private:
zeek::TypePtr type;
zeek::detail::CompositeHash* hash;
probabilistic::BloomFilter* bloom_filter;
zeek::probabilistic::BloomFilter* bloom_filter;
};
class CardinalityVal : public OpaqueVal {
public:
explicit CardinalityVal(probabilistic::CardinalityCounter*);
explicit CardinalityVal(zeek::probabilistic::detail::CardinalityCounter*);
~CardinalityVal() override;
ValPtr DoClone(CloneState* state) override;
@ -355,7 +353,7 @@ public:
bool Typify(zeek::TypePtr type);
probabilistic::CardinalityCounter* Get() { return c; };
zeek::probabilistic::detail::CardinalityCounter* Get() { return c; };
protected:
CardinalityVal();
@ -364,7 +362,7 @@ protected:
private:
zeek::TypePtr type;
zeek::detail::CompositeHash* hash;
probabilistic::CardinalityCounter* c;
zeek::probabilistic::detail::CardinalityCounter* c;
};
class ParaglobVal : public OpaqueVal {