Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 05:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move BroString to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 10:54:29 -07:00
parent 464efbe66a
commit 58c6e10b62
54 changed files with 317 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/SmithWaterman.h
View file

@ -11,7 +11,7 @@
// for each of which we store where the substring starts.
//
//
class BroSubstring : public BroString {
class BroSubstring : public zeek::BroString {
public:
typedef std::vector<BroSubstring*> Vec;
@ -22,12 +22,12 @@ public:
//
struct BSSAlign {
BSSAlign(const BroString* string, int index)
BSSAlign(const zeek::BroString* string, int index)
{ this->string = string; this->index = index; }
// The other string
//
const BroString* string;
const zeek::BroString* string;
// Offset in the string that substring
// starts at, counting from 0.
@ -40,10 +40,10 @@ public:
typedef BSSAlignVec::const_iterator BSSAlignVecCIt;
explicit BroSubstring(const std::string& string)
: BroString(string), _num(), _new(false) { }
: zeek::BroString(string), _num(), _new(false) { }
explicit BroSubstring(const BroString& string)
: BroString(string), _num(), _new(false) { }
explicit BroSubstring(const zeek::BroString& string)
: zeek::BroString(string), _num(), _new(false) { }
BroSubstring(const BroSubstring& bst);
@ -56,7 +56,7 @@ public:
//
bool DoesCover(const BroSubstring* bst) const;
void AddAlignment(const BroString* string, int index);
void AddAlignment(const zeek::BroString* string, int index);
const BSSAlignVec& GetAlignments() const { return _aligns; }
unsigned int GetNumAlignments() const { return _aligns.size(); }
@ -71,8 +71,8 @@ public:
static zeek::VectorVal* VecToPolicy(Vec* vec);
static Vec* VecFromPolicy(zeek::VectorVal* vec);
static char* VecToString(Vec* vec);
static BroString::IdxVec* GetOffsetsVec(const Vec* vec,
unsigned int index);
static zeek::BroString::IdxVec* GetOffsetsVec(const Vec* vec,
unsigned int index);
private:
typedef std::map<std::string, void*> DataMap;
@ -148,6 +148,6 @@ struct SWParams {
// input strings where the string occurs. On error, or if no common
// subsequence exists, an empty vector is returned.
//
extern BroSubstring::Vec* smith_waterman(const BroString* s1,
const BroString* s2,
SWParams& params);
extern BroSubstring::Vec* smith_waterman(const zeek::BroString* s1,
const zeek::BroString* s2,
SWParams& params);