Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
d054f4da
Commit
d054f4da
authored
5 years ago
by
Markus Frank
Committed by
MarkusFrankATcernch
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix gcc 6.2 backwards compatibility
parent
c7b6bb04
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
DDCore/include/DD4hep/Volumes.h
+5
-2
5 additions, 2 deletions
DDCore/include/DD4hep/Volumes.h
DDG4/examples/readHEPMC.py
+2
-1
2 additions, 1 deletion
DDG4/examples/readHEPMC.py
with
7 additions
and
3 deletions
DDCore/include/DD4hep/Volumes.h
+
5
−
2
View file @
d054f4da
...
@@ -65,8 +65,11 @@ namespace dd4hep {
...
@@ -65,8 +65,11 @@ namespace dd4hep {
class
VolIDs
:
public
std
::
vector
<
VolID
>
{
class
VolIDs
:
public
std
::
vector
<
VolID
>
{
public:
public:
typedef
std
::
vector
<
VolID
>
Base
;
typedef
std
::
vector
<
VolID
>
Base
;
using
Base
::
Base
;
/// Default constructor
/// Copy operator
VolIDs
()
=
default
;
/// Move constructor
VolIDs
(
VolIDs
&&
copy
)
=
default
;
/// Copy constructor
VolIDs
(
const
VolIDs
&
copy
)
=
default
;
VolIDs
(
const
VolIDs
&
copy
)
=
default
;
/// Move assignment
/// Move assignment
VolIDs
&
operator
=
(
VolIDs
&&
copy
)
=
default
;
VolIDs
&
operator
=
(
VolIDs
&&
copy
)
=
default
;
...
...
This diff is collapsed.
Click to expand it.
DDG4/examples/readHEPMC.py
+
2
−
1
View file @
d054f4da
...
@@ -7,7 +7,8 @@ dd4hep simulation example setup using the python configuration
...
@@ -7,7 +7,8 @@ dd4hep simulation example setup using the python configuration
"""
"""
from
__future__
import
absolute_import
,
unicode_literals
from
__future__
import
absolute_import
,
unicode_literals
import
os
,
logging
import
os
import
logging
logging
.
basicConfig
(
format
=
'
%(levelname)s: %(message)s
'
,
level
=
logging
.
INFO
)
logging
.
basicConfig
(
format
=
'
%(levelname)s: %(message)s
'
,
level
=
logging
.
INFO
)
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
...
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