silenced sylvan and gmm warnings (for clang)

Former-commit-id: 20c561d2e2

src/adapters/GmmxxAdapter.h

@@ -11,7 +11,7 @@
 #include <new>
 #include <utility>
 
-#include "gmm/gmm_matrix.h"
+#include "src/utility/gmm.h"
 
 #include "src/storage/SparseMatrix.h"
 #include "src/utility/ConversionHelper.h"

src/solver/GmmxxLinearEquationSolver.cpp

@@ -10,7 +10,7 @@
 #include "src/exceptions/InvalidStateException.h"
 #include "src/settings/modules/GmmxxEquationSolverSettings.h"
 
-#include "gmm/gmm_iter_solvers.h"
+#include "src/utility/gmm.h"
 
 namespace storm {
     namespace solver {

src/solver/GmmxxLinearEquationSolver.h

@@ -1,7 +1,7 @@
 #ifndef STORM_SOLVER_GMMXXLINEAREQUATIONSOLVER_H_
 #define STORM_SOLVER_GMMXXLINEAREQUATIONSOLVER_H_
 
-#include "gmm/gmm_matrix.h"
+#include "src/utility/gmm.h"
 
 #include "LinearEquationSolver.h"
 

src/solver/GmmxxMinMaxLinearEquationSolver.h

@@ -1,8 +1,10 @@
 #ifndef STORM_SOLVER_GMMXXMINMAXLINEAREQUATIONSOLVER_H_
 #define STORM_SOLVER_GMMXXMINMAXLINEAREQUATIONSOLVER_H_
 
-#include "gmm/gmm_matrix.h"
 #include <memory>
+
+#include "src/utility/gmm.h"
+
 #include "src/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {

src/storage/dd/DdManager.cpp

@@ -8,7 +8,7 @@
 namespace storm {
     namespace dd {
         template<DdType LibraryType>
-        DdManager<LibraryType>::DdManager() : metaVariableMap(), manager(new storm::expressions::ExpressionManager()), internalDdManager() {
+        DdManager<LibraryType>::DdManager() : internalDdManager(), metaVariableMap(), manager(new storm::expressions::ExpressionManager()) {
             // Intentionally left empty.
         }
         

src/storage/dd/sylvan/InternalSylvanBdd.h

@@ -9,7 +9,7 @@
 #include "src/storage/dd/InternalBdd.h"
 #include "src/storage/dd/InternalAdd.h"
 
-#include "sylvan_obj.hpp"
+#include "src/utility/sylvan.h"
 
 namespace storm {
     namespace storage {

src/storage/dd/sylvan/InternalSylvanDdManager.cpp

@@ -9,8 +9,6 @@
 #include "src/utility/macros.h"
 #include "src/exceptions/NotSupportedException.h"
 
-#include <iostream>
-
 namespace storm {
     namespace dd {
         uint_fast64_t InternalDdManager<DdType::Sylvan>::numberOfInstances = 0;
@@ -21,10 +19,11 @@ namespace storm {
         
         uint_fast64_t findLargestPowerOfTwoFitting(uint_fast64_t number) {
             for (uint_fast64_t index = 0; index < 64; ++index) {
-                if ((number & (1ull << 63 - index)) != 0) {
+                if ((number & (1ull << (63 - index))) != 0) {
                     return 63 - index;
                 }
             }
+            return 0;
         }
         
         InternalDdManager<DdType::Sylvan>::InternalDdManager() {

src/storage/dd/sylvan/SylvanAddIterator.h

@@ -6,7 +6,7 @@
 #include "src/storage/dd/AddIterator.h"
 #include "src/storage/expressions/SimpleValuation.h"
 
-#include "sylvan_obj.hpp"
+#include "src/utility/sylvan.h"
 
 namespace storm {
     namespace dd {

src/utility/gmm.h

@@ -0,0 +1,12 @@
+#ifndef STORM_UTILITY_GMM_H_
+#define STORM_UTILITY_GMM_H_
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-variable"
+
+#include "gmm/gmm_matrix.h"
+#include "gmm/gmm_iter_solvers.h"
+
+#pragma clang diagnostic pop
+
+#endif /* STORM_UTILITY_GMM_H_ */

src/utility/sylvan.h

@@ -0,0 +1,15 @@
+#ifndef STORM_STORAGE_DD_SYLVAN_SYLVAN_H_
+#define STORM_STORAGE_DD_SYLVAN_SYLVAN_H_
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wextra-semi"
+#pragma clang diagnostic ignored "-Wzero-length-array"
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma clang diagnostic ignored "-Wc99-extensions"
+
+#include "sylvan_obj.hpp"
+
+#pragma clang diagnostic pop
+
+#endif /* STORM_STORAGE_DD_SYLVAN_SYLVAN_H_ */