Commit e0c70a5c authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Remove warnings on gcc7

parent 49c3635e
......@@ -453,7 +453,8 @@ void ReadMezzAFP::process_initialise (unsigned int *error_code)
afile.close();
TotalEntryFileSize += size;
}
//nobreak;
/* fall through */
case 2:
Log << info << "List of file to be read is " << fListOfFile.size() << nline ;
break;
......
......@@ -32,7 +32,7 @@ if (ROOT_CONFIG)
endif()
else()
message(STATUS "ROOTConfig.cmake not found, trying to use FindROOT.cmake...")
find_package(ROOT REQUIRED COMPONENTS Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc)
find_package(ROOT REQUIRED COMPONENTS Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc Spectrum)
INCLUDE_DIRECTORIES( ${ROOT_INCLUDE_DIR} )
LINK_DIRECTORIES( ${ROOT_LIBRARY_DIR} )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}" )
......
......@@ -422,9 +422,10 @@ void Level::ExecuteEvent(Int_t event, Int_t px, Int_t py)
case kButton1Down:
gVirtualX->SetLineColor(-1);
TAttLine::Modify(); //Change line attributes only if necessary
// No break !!!
case kMouseMotion:
TAttLine::Modify(); //Change line attributes only if necessary
/* fall through */
case kMouseMotion:
if (TestBit(kLineNDC)) {
px1 = gPad->UtoPixel(fX1);
......
......@@ -110,13 +110,19 @@ MatPlayer::~MatPlayer()
void MatPlayer::Clear(const Option_t */*opt*/)
{
if ( fTotx ) delete fTotx; fTotx = NULL;
if ( fToty ) delete fToty; fToty = NULL;
if ( fPx ) delete fPx; fPx = NULL;
if ( fPy ) delete fPy; fPy = NULL;
if ( fBx ) delete fBx; fBx = NULL;
if ( fBy ) delete fBy; fBy = NULL;
if ( fTotx ) delete fTotx;
fTotx = NULL;
if ( fToty ) delete fToty;
fToty = NULL;
if ( fPx ) delete fPx;
fPx = NULL;
if ( fPy ) delete fPy;
fPy = NULL;
if ( fBx ) delete fBx;
fBx = NULL;
if ( fBy ) delete fBy;
fBy = NULL;
}
void MatPlayer::SetCanvas()
......@@ -555,7 +561,8 @@ void MatPlayer::XEventAction(Int_t event, Int_t px, Int_t py, TObject */*sel*/)
case kKey_r:
Reset();
pad->Update();
//nobreak
/* fall through */
case kKey_s:
ShowGates("");
pad->Update();
......
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