Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
Shaun Roe
athena
Commits
49677727
Commit
49677727
authored
3 years ago
by
scott snyder
Browse files
Options
Downloads
Patches
Plain Diff
RootStorageSvc: Fix clang warnings.
Missing overide keywords.
parent
97f0d420
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Database/APR/RootStorageSvc/src/RootTreeContainer.h
+12
-12
12 additions, 12 deletions
Database/APR/RootStorageSvc/src/RootTreeContainer.h
Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
+2
-2
2 additions, 2 deletions
Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
with
14 additions
and
14 deletions
Database/APR/RootStorageSvc/src/RootTreeContainer.h
+
12
−
12
View file @
49677727
/*
/*
Copyright (C) 2002-202
1
CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-202
2
CERN for the benefit of the ATLAS collaboration
*/
*/
//====================================================================
//====================================================================
...
@@ -193,7 +193,7 @@ namespace pool {
...
@@ -193,7 +193,7 @@ namespace pool {
virtual
~
RootTreeContainer
();
virtual
~
RootTreeContainer
();
/// Close the container and deallocate resources
/// Close the container and deallocate resources
virtual
DbStatus
close
();
virtual
DbStatus
close
()
override
;
/// Open the container for object access
/// Open the container for object access
virtual
DbStatus
open
(
DbDatabase
&
dbH
,
virtual
DbStatus
open
(
DbDatabase
&
dbH
,
...
@@ -206,23 +206,23 @@ namespace pool {
...
@@ -206,23 +206,23 @@ namespace pool {
*
*
* @return DbStatus code indicating success or failure.
* @return DbStatus code indicating success or failure.
*/
*/
virtual
DbStatus
getOption
(
DbOption
&
opt
)
const
;
virtual
DbStatus
getOption
(
DbOption
&
opt
)
const
override
;
/// Set options
/// Set options
/** @param opt [IN] Reference to option object.
/** @param opt [IN] Reference to option object.
*
*
* @return DbStatus code indicating success or failure.
* @return DbStatus code indicating success or failure.
*/
*/
virtual
DbStatus
setOption
(
const
DbOption
&
opt
);
virtual
DbStatus
setOption
(
const
DbOption
&
opt
)
override
;
/// Ask if a given shape is supported
/// Ask if a given shape is supported
virtual
DbStatus
isShapeSupported
(
const
DbTypeInfo
*
typ
)
const
;
virtual
DbStatus
isShapeSupported
(
const
DbTypeInfo
*
typ
)
const
override
;
/// Define selection criteria
/// Define selection criteria
virtual
DbStatus
select
(
DbSelect
&
criteria
);
virtual
DbStatus
select
(
DbSelect
&
criteria
)
override
;
/// Number of entries within the container
/// Number of entries within the container
virtual
long
long
int
size
();
virtual
long
long
int
size
()
override
;
/// return the TTree in which this container is stored
/// return the TTree in which this container is stored
TTree
*
getTTree
()
{
return
m_tree
;
}
TTree
*
getTTree
()
{
return
m_tree
;
}
...
@@ -246,10 +246,10 @@ namespace pool {
...
@@ -246,10 +246,10 @@ namespace pool {
void
clearDirty
()
{
m_isDirty
=
false
;
}
void
clearDirty
()
{
m_isDirty
=
false
;
}
/// Fetch next object address of the selection to set token
/// Fetch next object address of the selection to set token
virtual
DbStatus
fetch
(
DbSelect
&
sel
);
virtual
DbStatus
fetch
(
DbSelect
&
sel
)
override
;
/// Fetch refined object address. Default implementation returns identity
/// Fetch refined object address. Default implementation returns identity
virtual
DbStatus
fetch
(
const
Token
::
OID_t
&
linkH
,
Token
::
OID_t
&
stmt
);
virtual
DbStatus
fetch
(
const
Token
::
OID_t
&
linkH
,
Token
::
OID_t
&
stmt
)
override
;
/// Find object by object identifier and load it into memory
/// Find object by object identifier and load it into memory
/** @param ptr [IN/OUT] ROOT-style address of the pointer to object
/** @param ptr [IN/OUT] ROOT-style address of the pointer to object
...
@@ -259,7 +259,7 @@ namespace pool {
...
@@ -259,7 +259,7 @@ namespace pool {
* @return Status code indicating success or failure.
* @return Status code indicating success or failure.
*/
*/
virtual
DbStatus
loadObject
(
void
**
ptr
,
ShapeH
shape
,
virtual
DbStatus
loadObject
(
void
**
ptr
,
ShapeH
shape
,
Token
::
OID_t
&
oid
);
Token
::
OID_t
&
oid
)
override
;
/// Create TBranch for a basic type (ROOT type notation given in the leafname)
/// Create TBranch for a basic type (ROOT type notation given in the leafname)
void
createBasicAuxBranch
(
const
std
::
string
&
branchname
,
void
createBasicAuxBranch
(
const
std
::
string
&
branchname
,
...
@@ -267,10 +267,10 @@ namespace pool {
...
@@ -267,10 +267,10 @@ namespace pool {
BranchDesc
&
dsc
);
BranchDesc
&
dsc
);
/// Commit single entry to container
/// Commit single entry to container
virtual
DbStatus
writeObject
(
ActionList
::
value_type
&
);
virtual
DbStatus
writeObject
(
ActionList
::
value_type
&
)
override
;
/// Execute Transaction action
/// Execute Transaction action
virtual
DbStatus
transAct
(
Transaction
::
Action
action
);
virtual
DbStatus
transAct
(
Transaction
::
Action
action
)
override
;
};
};
}
}
#endif //POOL_ROOTTREECONTAINER_H
#endif //POOL_ROOTTREECONTAINER_H
This diff is collapsed.
Click to expand it.
Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
+
2
−
2
View file @
49677727
...
@@ -56,10 +56,10 @@ namespace pool {
...
@@ -56,10 +56,10 @@ namespace pool {
* @return Status code indicating success or failure.
* @return Status code indicating success or failure.
*/
*/
virtual
DbStatus
loadObject
(
void
**
ptr
,
ShapeH
shape
,
virtual
DbStatus
loadObject
(
void
**
ptr
,
ShapeH
shape
,
Token
::
OID_t
&
oid
);
Token
::
OID_t
&
oid
)
override
;
/// Commit single entry to container
/// Commit single entry to container
virtual
DbStatus
writeObject
(
ActionList
::
value_type
&
);
virtual
DbStatus
writeObject
(
ActionList
::
value_type
&
)
override
;
private
:
private
:
/// Pointer to index branch
/// Pointer to index branch
...
...
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