From 0d6612352c0bb23d6f59f4152796bf75452ccd96 Mon Sep 17 00:00:00 2001 From: dehnert Date: Fri, 11 Dec 2015 19:52:22 +0100 Subject: [PATCH] silenced sylvan and gmm warnings (for clang) Former-commit-id: 20c561d2e241ae26ad9ff9547395dec5bab437c7 --- src/adapters/GmmxxAdapter.h | 2 +- src/solver/GmmxxLinearEquationSolver.cpp | 2 +- src/solver/GmmxxLinearEquationSolver.h | 2 +- src/solver/GmmxxMinMaxLinearEquationSolver.h | 4 +++- src/storage/dd/DdManager.cpp | 2 +- src/storage/dd/sylvan/InternalSylvanBdd.h | 2 +- src/storage/dd/sylvan/InternalSylvanDdManager.cpp | 5 ++--- src/storage/dd/sylvan/SylvanAddIterator.h | 2 +- src/utility/gmm.h | 12 ++++++++++++ src/utility/sylvan.h | 15 +++++++++++++++ 10 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 src/utility/gmm.h create mode 100644 src/utility/sylvan.h diff --git a/src/adapters/GmmxxAdapter.h b/src/adapters/GmmxxAdapter.h index b1d2206a5..320e57021 100644 --- a/src/adapters/GmmxxAdapter.h +++ b/src/adapters/GmmxxAdapter.h @@ -11,7 +11,7 @@ #include #include -#include "gmm/gmm_matrix.h" +#include "src/utility/gmm.h" #include "src/storage/SparseMatrix.h" #include "src/utility/ConversionHelper.h" diff --git a/src/solver/GmmxxLinearEquationSolver.cpp b/src/solver/GmmxxLinearEquationSolver.cpp index 123e0c440..ad5729774 100644 --- a/src/solver/GmmxxLinearEquationSolver.cpp +++ b/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 { diff --git a/src/solver/GmmxxLinearEquationSolver.h b/src/solver/GmmxxLinearEquationSolver.h index ec7aceb6d..a8a029728 100644 --- a/src/solver/GmmxxLinearEquationSolver.h +++ b/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" diff --git a/src/solver/GmmxxMinMaxLinearEquationSolver.h b/src/solver/GmmxxMinMaxLinearEquationSolver.h index ed91278bc..08432658e 100644 --- a/src/solver/GmmxxMinMaxLinearEquationSolver.h +++ b/src/solver/GmmxxMinMaxLinearEquationSolver.h @@ -1,8 +1,10 @@ #ifndef STORM_SOLVER_GMMXXMINMAXLINEAREQUATIONSOLVER_H_ #define STORM_SOLVER_GMMXXMINMAXLINEAREQUATIONSOLVER_H_ -#include "gmm/gmm_matrix.h" #include + +#include "src/utility/gmm.h" + #include "src/solver/MinMaxLinearEquationSolver.h" namespace storm { diff --git a/src/storage/dd/DdManager.cpp b/src/storage/dd/DdManager.cpp index c295629f3..17e237986 100644 --- a/src/storage/dd/DdManager.cpp +++ b/src/storage/dd/DdManager.cpp @@ -8,7 +8,7 @@ namespace storm { namespace dd { template - DdManager::DdManager() : metaVariableMap(), manager(new storm::expressions::ExpressionManager()), internalDdManager() { + DdManager::DdManager() : internalDdManager(), metaVariableMap(), manager(new storm::expressions::ExpressionManager()) { // Intentionally left empty. } diff --git a/src/storage/dd/sylvan/InternalSylvanBdd.h b/src/storage/dd/sylvan/InternalSylvanBdd.h index fba511223..5695ff2d5 100644 --- a/src/storage/dd/sylvan/InternalSylvanBdd.h +++ b/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 { diff --git a/src/storage/dd/sylvan/InternalSylvanDdManager.cpp b/src/storage/dd/sylvan/InternalSylvanDdManager.cpp index c91845b8d..ea78ac8e1 100644 --- a/src/storage/dd/sylvan/InternalSylvanDdManager.cpp +++ b/src/storage/dd/sylvan/InternalSylvanDdManager.cpp @@ -9,8 +9,6 @@ #include "src/utility/macros.h" #include "src/exceptions/NotSupportedException.h" -#include - namespace storm { namespace dd { uint_fast64_t InternalDdManager::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::InternalDdManager() { diff --git a/src/storage/dd/sylvan/SylvanAddIterator.h b/src/storage/dd/sylvan/SylvanAddIterator.h index dc3523aa0..b691c77b0 100644 --- a/src/storage/dd/sylvan/SylvanAddIterator.h +++ b/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 { diff --git a/src/utility/gmm.h b/src/utility/gmm.h new file mode 100644 index 000000000..c1999a9e7 --- /dev/null +++ b/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_ */ \ No newline at end of file diff --git a/src/utility/sylvan.h b/src/utility/sylvan.h new file mode 100644 index 000000000..ccaffe097 --- /dev/null +++ b/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_ */ \ No newline at end of file