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
b31d1506
Commit
b31d1506
authored
5 years ago
by
Enrico Guiraud
Browse files
Options
Downloads
Patches
Plain Diff
[DF][NFC] Remove unused template parameter from method
parent
a26ce96e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tree/dataframe/inc/ROOT/RDF/RCustomColumn.hxx
+7
-8
7 additions, 8 deletions
tree/dataframe/inc/ROOT/RDF/RCustomColumn.hxx
with
7 additions
and
8 deletions
tree/dataframe/inc/ROOT/RDF/RCustomColumn.hxx
+
7
−
8
View file @
b31d1506
...
@@ -67,8 +67,8 @@ class RCustomColumn final : public RCustomColumnBase {
...
@@ -67,8 +67,8 @@ class RCustomColumn final : public RCustomColumnBase {
/// The nth flag signals whether the nth input column is a custom column or not.
/// The nth flag signals whether the nth input column is a custom column or not.
std
::
array
<
bool
,
ColumnTypes_t
::
list_size
>
fIsCustomColumn
;
std
::
array
<
bool
,
ColumnTypes_t
::
list_size
>
fIsCustomColumn
;
template
<
std
::
size_t
...
S
,
typename
...
BranchTypes
>
template
<
std
::
size_t
...
S
>
void
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
TypeList
<
BranchTypes
...
>
,
NoneTag
)
void
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
NoneTag
)
{
{
fLastResults
[
slot
]
=
fExpression
(
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
fLastResults
[
slot
]
=
fExpression
(
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
// silence "unused parameter" warnings in gcc
// silence "unused parameter" warnings in gcc
...
@@ -76,8 +76,8 @@ class RCustomColumn final : public RCustomColumnBase {
...
@@ -76,8 +76,8 @@ class RCustomColumn final : public RCustomColumnBase {
(
void
)
entry
;
(
void
)
entry
;
}
}
template
<
std
::
size_t
...
S
,
typename
...
BranchTypes
>
template
<
std
::
size_t
...
S
>
void
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
TypeList
<
BranchTypes
...
>
,
SlotTag
)
void
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
SlotTag
)
{
{
fLastResults
[
slot
]
=
fExpression
(
slot
,
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
fLastResults
[
slot
]
=
fExpression
(
slot
,
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
// silence "unused parameter" warnings in gcc
// silence "unused parameter" warnings in gcc
...
@@ -85,9 +85,8 @@ class RCustomColumn final : public RCustomColumnBase {
...
@@ -85,9 +85,8 @@ class RCustomColumn final : public RCustomColumnBase {
(
void
)
entry
;
(
void
)
entry
;
}
}
template
<
std
::
size_t
...
S
,
typename
...
BranchTypes
>
template
<
std
::
size_t
...
S
>
void
void
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
SlotAndEntryTag
)
UpdateHelper
(
unsigned
int
slot
,
Long64_t
entry
,
std
::
index_sequence
<
S
...
>
,
TypeList
<
BranchTypes
...
>
,
SlotAndEntryTag
)
{
{
fLastResults
[
slot
]
=
fExpression
(
slot
,
entry
,
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
fLastResults
[
slot
]
=
fExpression
(
slot
,
entry
,
std
::
get
<
S
>
(
fValues
[
slot
]).
Get
(
entry
)...);
// silence "unused parameter" warnings in gcc
// silence "unused parameter" warnings in gcc
...
@@ -123,7 +122,7 @@ public:
...
@@ -123,7 +122,7 @@ public:
{
{
if
(
entry
!=
fLastCheckedEntry
[
slot
])
{
if
(
entry
!=
fLastCheckedEntry
[
slot
])
{
// evaluate this filter, cache the result
// evaluate this filter, cache the result
UpdateHelper
(
slot
,
entry
,
TypeInd_t
(),
ColumnTypes_t
(),
ExtraArgsTag
{});
UpdateHelper
(
slot
,
entry
,
TypeInd_t
(),
ExtraArgsTag
{});
fLastCheckedEntry
[
slot
]
=
entry
;
fLastCheckedEntry
[
slot
]
=
entry
;
}
}
}
}
...
...
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