Commit b5a80681 authored by Victor Poughon's avatar Victor Poughon

Merge branch 'gcc7_defined_warning' into 'develop'

COMP: fix gcc 7 'defined' warnings

See merge request orfeotoolbox/otb!127
parents 39b50f1f 63774783
......@@ -28,7 +28,7 @@
#include "ConfigureMonteverdi.h"
#define USE_TABBED_VIEW 0
#define USE_PIXEL_DESCRIPTION ( ( defined( OTB_DEBUG ) && 0 ) || 0 )
#define USE_PIXEL_DESCRIPTION 0
#define RENDER_IMAGE_VIEW_DISABLED 0
#define RENDER_QUICKLOOK_VIEW_DISABLED 0
......
......@@ -37,7 +37,7 @@
#include <QPixmap>
#include <QSplashScreen>
#define USE_SPLASH_SCREEN ( ( !defined( OTB_DEBUG ) && 0 ) || 0 )
#define USE_SPLASH_SCREEN 0
//
// System includes (sorted by alphabetic order)
......
......@@ -109,7 +109,7 @@ namespace mvd
#define REFERENCE_LAYER_COMBOBOX_NAME "referenceLayerComboBox"
#define FORCE_NO_GLSL ( ( defined( OTB_DEBUG ) && 0 ) || 0 )
#define FORCE_NO_GLSL 0
/*****************************************************************************/
/* STATIC IMPLEMENTATION SECTION */
......
......@@ -30,9 +30,9 @@
//
#define USE_VIEW_SETTINGS_SIDE_EFFECT 1
//
#define USE_REMOTE_DESKTOP_DISABLED_RENDERING ((defined( OTB_DEBUG ) && 0) || 0)
#define USE_REMOTE_DESKTOP_DISABLED_RENDERING 0
//
#define DISABLE_QUICKLOOK_VIEW ( ( defined( OTB_DEBUG ) && 0 ) || 0 )
#define DISABLE_QUICKLOOK_VIEW 0
/*****************************************************************************/
/* INCLUDE SECTION */
......
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