Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
Sherpa Team
sherpa
Commits
7be14189
Commit
7be14189
authored
Jul 17, 2012
by
Frank Siegert
Browse files
Fixes for gcc 4.7 compilation. Merged from trunk r19313.
parent
5704e84b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
1 deletion
+6
-1
AMEGIC++/Main/Single_Process.C
AMEGIC++/Main/Single_Process.C
+2
-0
AMEGIC++/Main/Single_Process_Combined.C
AMEGIC++/Main/Single_Process_Combined.C
+2
-0
ATOOLS/Org/Shell_Tools.C
ATOOLS/Org/Shell_Tools.C
+1
-0
COMIX/Amplitude/Amplitude.C
COMIX/Amplitude/Amplitude.C
+1
-1
No files found.
AMEGIC++/Main/Single_Process.C
View file @
7be14189
...
...
@@ -14,6 +14,8 @@
#include "ATOOLS/Org/MyStrStream.H"
#include "ATOOLS/Org/Data_Reader.H"
#include <unistd.h>
using
namespace
AMEGIC
;
using
namespace
MODEL
;
using
namespace
PHASIC
;
...
...
AMEGIC++/Main/Single_Process_Combined.C
View file @
7be14189
...
...
@@ -14,6 +14,8 @@
#include "ATOOLS/Org/MyStrStream.H"
#include "ATOOLS/Org/Data_Reader.H"
#include <unistd.h>
using
namespace
AMEGIC
;
using
namespace
MODEL
;
using
namespace
PHASIC
;
...
...
ATOOLS/Org/Shell_Tools.C
View file @
7be14189
...
...
@@ -7,6 +7,7 @@
#include <errno.h>
#include <dirent.h>
#include <cstdlib>
#include <unistd.h>
#if __GNUC__
#include <cxxabi.h>
#endif
...
...
COMIX/Amplitude/Amplitude.C
View file @
7be14189
...
...
@@ -160,7 +160,7 @@ Current *Amplitude::CopyCurrent(Current *const c)
Current_Key
ckey
(
c
->
Flav
(),
p_model
);
Current
*
cur
(
Current_Getter
::
GetObject
(
std
::
string
(
1
,
m_pmode
)
+
ckey
.
Type
(),
ckey
));
if
(
cur
==
NULL
)
return
false
;
if
(
cur
==
NULL
)
return
NULL
;
cur
->
SetDirection
(
c
->
Direction
());
cur
->
SetCut
(
c
->
Cut
());
cur
->
SetOnShell
(
c
->
OnShell
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment