Compilation on Fedora 24.

diff --git a/Makefile.am b/Makefile.am
index ada26698f537ded7a02b9558892de3768f6a1a5f..0665d100ae6117996470fb3b0d069785b58cf0f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,7 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-                  -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+ACLOCAL_AMFLAGS = -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
 
 if GUI_ENABLE_CORBA
     IDLDIR = idl

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index 970b2676f872c21049bac2ffd498a348d88aa5ac..e2cb220527f8d05888c631cb272245256b7df394 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -367,7 +367,7 @@ int QtxPopupMgr::insertAction( QAction* a, const int pId, const QString& rule, c
 */
 bool QtxPopupMgr::hasRule( QAction* a, const RuleType t ) const
 {
-  return a ? expression( a, t, false ) : false;
+  return a ? ( expression( a, t, false ) != NULL ) : false;
 }
 
 /*!

diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index 64bfa241e2a45f74b4be0fd2801a012c480cf25d..cdc067c45763bae42a64dce6c7de16103b9f5fab 100644 (file)
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.cxx
@@ -454,7 +454,7 @@ QColor Style_Model::getColorValue( int theId, const bool theIsDef ) const
 
 QString Style_Model::getStringValue( int theId, const bool theIsDef ) const
 {
-  QString aRes = false;
+  QString aRes;
   QVariant aValue;
   if ( myValues.contains(theId) && myValues[theId].myType == String ) {
     if ( theIsDef )