From 5530f908ca930bdf95e6456be64dd4cf3eb2eb93 Mon Sep 17 00:00:00 2001 From: Mavo Date: Sun, 31 Jul 2016 20:37:16 +0200 Subject: [PATCH] Fixed compile issues under Linux Former-commit-id: 61a69f9fc7beb07b06bd1bd0e0c15c209a142541 --- src/builder/ExplicitGspnModelBuilder.h | 6 +++--- src/storage/gspn/GSPN.h | 1 + src/storage/gspn/Marking.h | 1 + src/utility/constants.cpp | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/builder/ExplicitGspnModelBuilder.h b/src/builder/ExplicitGspnModelBuilder.h index 16c0c8a72..38ba60f0b 100644 --- a/src/builder/ExplicitGspnModelBuilder.h +++ b/src/builder/ExplicitGspnModelBuilder.h @@ -1,12 +1,12 @@ #ifndef STORM_BUILDER_EXPLICITGSPNMODELBUILDER_H_ #define STORM_BUILDER_EXPLICITGSPNMODELBUILDER_H_ -#include +#include #include "src/models/sparse/MarkovAutomaton.h" #include "src/models/sparse/StandardRewardModel.h" -#include "src/storage/Bitvector.h" -#include "src/storage/BitvectorHashMap.h" +#include "src/storage/BitVector.h" +#include "src/storage/BitVectorHashMap.h" #include "src/storage/gspn/GSPN.h" #include "src/storage/gspn/ImmediateTransition.h" #include "src/storage/gspn/TimedTransition.h" diff --git a/src/storage/gspn/GSPN.h b/src/storage/gspn/GSPN.h index 3217af882..8c569d1e7 100644 --- a/src/storage/gspn/GSPN.h +++ b/src/storage/gspn/GSPN.h @@ -3,6 +3,7 @@ #include #include +#include #include "src/storage/gspn/ImmediateTransition.h" #include "src/storage/gspn/Marking.h" diff --git a/src/storage/gspn/Marking.h b/src/storage/gspn/Marking.h index 2e5095e50..04d6ac08e 100644 --- a/src/storage/gspn/Marking.h +++ b/src/storage/gspn/Marking.h @@ -3,6 +3,7 @@ #include #include +#include #include "src/storage/BitVector.h" namespace storm { diff --git a/src/utility/constants.cpp b/src/utility/constants.cpp index d5dba5ace..436cfcce0 100644 --- a/src/utility/constants.cpp +++ b/src/utility/constants.cpp @@ -117,6 +117,11 @@ namespace storm { } #ifdef STORM_HAVE_CARL + template<> + RationalNumber pow(RationalNumber const& value, uint_fast64_t exponent) { + return carl::pow(value, exponent); + } + template<> RationalFunction& simplify(RationalFunction& value);