Commit 5f4234eb authored by Jan Oliver Oelerich's avatar Jan Oliver Oelerich

Removed some compilations warnings

parent 1fc9063f
......@@ -362,7 +362,7 @@ void Simulation::calculatePixel(ScanPoint &point, const double defocus) {
int ind = _gridman->adfBinIndex(ix, iy);
if(ind >= 0 && ind < _gridman->adfDetectorGrid().size()) {
if(ind >= 0 && ind < (int)_gridman->adfDetectorGrid().size()) {
// check for not a number
auto intens = (float) pow(abs(wave(ix, iy)), 2);
if(!::isnan(intens))
......
......@@ -28,12 +28,16 @@
#include <sstream>
#include <map>
#ifdef __GNUC__
#if GNUC > 7
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#include "../3rdparty/jsoncpp/json/json.h"
#pragma GCC diagnostic pop
#endif
#endif
#include "elements_json.hpp"
#include "../utilities/output.hpp"
......
......@@ -37,14 +37,17 @@
#include <execinfo.h>
#include <unistd.h>
#ifdef __GNUC__
#if GNUC > 7
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#include "../3rdparty/tinyformat/tinyformat.h"
#pragma GCC diagnostic pop
#endif
#endif
//#include "../3rdparty/date/date.h"
#include "mpi.hpp"
#include "../classes/Params.hpp"
......
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