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

Merge branch 'preprod' into 'master'

correct an include needed in old gcc version

See merge request IPNL_GAMMA/narval_emulator!39
parents 41bba6a3 5a5d9afa
...@@ -23,6 +23,11 @@ compile: ...@@ -23,6 +23,11 @@ compile:
- export LD_LIBRARY_PATH=$ROOTSYS/lib/:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=$ROOTSYS/lib/:$LD_LIBRARY_PATH
- echo "Compilation with ROOT..." - echo "Compilation with ROOT..."
- python scripts/gRaySoftware.py --agapro= conf compile install - python scripts/gRaySoftware.py --agapro= conf compile install
- echo "Compilation of femul..."
- cd LNL
- ln -s ../agapro/WinCtest femul
- cd ..
- python scripts/gRaySoftware.py --femul= conf compile install
- cd agapro/ - cd agapro/
- mkdir -p cppcheck_output - mkdir -p cppcheck_output
- cppcheck --xml --xml-version=2 --enable=style,performance,portability,unusedFunction -i AGATREE -i PRISMA -i cmake -i config -i zPrograms -i zUseful . 2> cppcheck_output/output.xml - cppcheck --xml --xml-version=2 --enable=style,performance,portability,unusedFunction -i AGATREE -i PRISMA -i cmake -i config -i zPrograms -i zUseful . 2> cppcheck_output/output.xml
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "AGAPRO_TB_AGATA.h" #include "AGAPRO_TB_AGATA.h"
#endif #endif
#include <algorithm>
#include "TrackedFrame.h" #include "TrackedFrame.h"
#include "PSAFrame.h" #include "PSAFrame.h"
......
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