Commit 3e0c0de1 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

Merge branch 'warnings_fix_3' into 'develop'

Warnings fixes (clang and OSSIM)

See merge request !219
parents fa93eaec dad095be
......@@ -30,10 +30,11 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wheader-guard"
#pragma clang diagnostic ignored "-Wdivision-by-zero"
#else
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#endif
#include "otb_shark.h"
......
......@@ -29,9 +29,10 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wheader-guard"
#else
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#endif
#include "otb_shark.h"
......
......@@ -34,9 +34,10 @@
#pragma GCC diagnostic ignored "-Wcast-align"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wheader-guard"
#else
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#endif
#include <shark/Models/Classifier.h>
......
......@@ -33,9 +33,10 @@
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wcast-align"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wheader-guard"
#else
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#endif
......
......@@ -336,7 +336,14 @@ public:
virtual std::ostream& print(std::ostream& out) const override;
protected:
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
TYPE_DATA
#pragma clang diagnostic pop
#else
TYPE_DATA
#endif
/**
* Compute range and doppler frequency from an input point, sensor
......
......@@ -121,7 +121,7 @@ namespace ossimplugins
bool initImageSize(ossimIpt& imageSize) const;
virtual void imagingRay(ossimDpt const& image_point, ossimEcefRay& image_ray) const;
virtual void imagingRay(ossimDpt const& image_point, ossimEcefRay& image_ray) const override;
bool isSLC() const { return theSLC; }
bool isOCN() const { return theOCN; }
......@@ -141,8 +141,14 @@ namespace ossimplugins
theManifestDirectory = d;
}
protected:
TYPE_DATA;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
TYPE_DATA
#pragma clang diagnostic pop
#else
TYPE_DATA
#endif
private:
bool read(ossimFilename const& annotationXml);
......
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