Merge branch 'master' of https://github.com/zeek/zeek into topic/zeke/closures

This commit is contained in:
Zeke Medley 2019-06-27 14:39:08 -07:00
commit fef8aeb123
22 changed files with 79 additions and 325 deletions

View file

@ -708,7 +708,7 @@ StringVal::StringVal(const char* s) : Val(TYPE_STRING)
StringVal::StringVal(const string& s) : Val(TYPE_STRING)
{
val.string_val = new BroString(s.c_str());
val.string_val = new BroString(reinterpret_cast<const u_char*>(s.data()), s.length(), 1);
}
StringVal* StringVal::ToUpper()