Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Commits
a1130e6e
Commit
a1130e6e
authored
7 years ago
by
Tadej Novak
Browse files
Options
Downloads
Patches
Plain Diff
Partially revert memory leak fix to avoid segfault
Former-commit-id:
8ff9b28f
parent
8bc274ac
Loading
Loading
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc
+0
-6
0 additions, 6 deletions
...lay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc
with
0 additions
and
6 deletions
Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc
+
0
−
6
View file @
a1130e6e
...
...
@@ -150,7 +150,6 @@ std::cout<<"start overlayContainer"<<std::endl;
if
(
outputContainer
->
addCollection
(
coll_data
,
p_data
.
hashId
()).
isFailure
()
)
{
parent
->
msg
(
MSG
::
WARNING
)
<<
"add data Collection failed for output "
<<
p_data
.
hashId
()
<<
endmsg
;
}
delete
coll_data
;
}
/** Add data from the ovl container to the output one */
...
...
@@ -184,19 +183,14 @@ std::cout<<"start overlayContainer"<<std::endl;
outputContainer
->
removeCollection
(
p_ovl
.
hashId
());
if
(
outputContainer
->
addCollection
(
out_coll
,
p_ovl
.
hashId
()).
isFailure
()
)
{
parent
->
msg
(
MSG
::
WARNING
)
<<
"overlay addCollection failed "
<<
endreq
;
delete
out_coll
;
}
delete
coll_data
;
delete
coll_ovl
;
}
else
{
/** Copy the complete collection from ovl to output,
hopefully preserving the "most derived" type of its raw data */
if
(
outputContainer
->
addCollection
(
coll_ovl
,
coll_id
).
isFailure
()
)
{
parent
->
msg
(
MSG
::
WARNING
)
<<
"add mc Collection failed "
<<
endreq
;
delete
coll_ovl
;
}
delete
out_coll
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment