Commit 7be14189 authored by Frank Siegert's avatar Frank Siegert
Browse files

Fixes for gcc 4.7 compilation. Merged from trunk r19313.

parent 5704e84b
......@@ -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;
......
......@@ -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;
......
......@@ -7,6 +7,7 @@
#include <errno.h>
#include <dirent.h>
#include <cstdlib>
#include <unistd.h>
#if __GNUC__
#include <cxxabi.h>
#endif
......
......@@ -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());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment