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

Move Location to zeek::detail and BroObj to zeek

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 13:09:43 -07:00
parent 58c6e10b62
commit 40ecede4ea
41 changed files with 158 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Reporter.cc
View file

@ -165,7 +165,7 @@ void Reporter::ExprRuntimeError(const zeek::detail::Expr* expr, const char* fmt,
throw InterpreterException();
}
void Reporter::RuntimeError(const Location* location, const char* fmt, ...)
void Reporter::RuntimeError(const zeek::detail::Location* location, const char* fmt, ...)
{
++errors;
PushLocation(location);
@ -469,11 +469,11 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out,
{
ODesc d;
std::pair<const Location*, const Location*> locs = locations.back();
std::pair<const zeek::detail::Location*, const zeek::detail::Location*> locs = locations.back();
if ( locs.first )
{
if ( locs.first != &no_location )
if ( locs.first != &zeek::detail::no_location )
locs.first->Describe(&d);
else
@ -483,7 +483,7 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out,
{
d.Add(" and ");
if ( locs.second != &no_location )
if ( locs.second != &zeek::detail::no_location )
locs.second->Describe(&d);
else