Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
47499e4c
Commit
47499e4c
authored
6 years ago
by
Enrico Guiraud
Browse files
Options
Downloads
Patches
Plain Diff
[DF] Make RResultPtr members non-const to allow copy/move assignment
Fixes ROOT-9526.
parent
5dc04847
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tree/dataframe/inc/ROOT/RResultPtr.hxx
+3
-3
3 additions, 3 deletions
tree/dataframe/inc/ROOT/RResultPtr.hxx
with
3 additions
and
3 deletions
tree/dataframe/inc/ROOT/RResultPtr.hxx
+
3
−
3
View file @
47499e4c
...
...
@@ -110,9 +110,9 @@ class RResultPtr {
/// \endcond
/// State registered also in the RLoopManager until the event loop is executed
const
ShrdPtrBool_t
fReadiness
=
std
::
make_shared
<
bool
>
(
false
);
ShrdPtrBool_t
fReadiness
=
std
::
make_shared
<
bool
>
(
false
);
WPTLM_t
fImplWeakPtr
;
///< Points to the RLoopManager at the root of the functional graph
const
SPT_t
fObjPtr
;
///< Shared pointer encapsulating the wrapped result
SPT_t
fObjPtr
;
///< Shared pointer encapsulating the wrapped result
/// Shared_ptr to a _pointer_ to the RDF action that produces this result. It is set at construction time for
/// non-jitted actions, and at jitting time for jitted actions (at the time of writing, this means right
/// before the event-loop).
...
...
@@ -120,7 +120,7 @@ class RResultPtr {
// This cannot be a unique_ptr because that would disallow copy-construction of TResultProxies.
// It cannot be just a pointer to RActionBase because we need something to store in the callback callable that will
// be passed to RLoopManager _before_ the pointer to RActionBase is set in the case of jitted actions.
const
std
::
shared_ptr
<
RDFInternal
::
RActionBase
*>
fActionPtrPtr
;
std
::
shared_ptr
<
RDFInternal
::
RActionBase
*>
fActionPtrPtr
;
/// Triggers the event loop in the RLoopManager instance to which it's associated via the fImplWeakPtr
void
TriggerRun
();
...
...
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