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

Fix a broken merge

Browse source 
I merged an old version of the branch on accident and then merged the right
one over top of it, but git ended up including both versions. This fixes
that mistake.

(cherry picked from commit f3bcf1a55d)
This commit is contained in:
Tim Wojtulewicz 2024-07-12 10:00:13 -07:00
parent 5f6df68463
commit a8c56c1f25
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/spicy/spicyz/driver.cc
View file

@ -35,15 +35,11 @@ struct VisitorTypes : public spicy::visitor::PreOrder {
: driver(driver), glue(glue), is_resolved(is_resolved) {}
void operator()(hilti::declaration::Module* n) final {
// Ignore modules built by us in memory, or builtin modules which
// never contain implementations of hooks for user types.
if ( n->uid().in_memory ||
(module == "hilti" || module == "spicy" || module == "spicy_rt" || module == "zeek_rt") ) {
if ( n->uid().in_memory ) {
// Ignore modules built by us in memory.
module = {};
return;
}
module = n->scopeID();
path = n->uid().path;