Merge remote-tracking branch 'upstream/master'

src/storm/abstraction/BottomStateResult.cpp

@@ -8,7 +8,7 @@ namespace storm {
             // Intentionally left empty.
         }
         
-        template class BottomStateResult<storm::dd::DdType::CUDD>;
-        template class BottomStateResult<storm::dd::DdType::Sylvan>;
+        template struct BottomStateResult<storm::dd::DdType::CUDD>;
+        template struct BottomStateResult<storm::dd::DdType::Sylvan>;
     }
 }

src/storm/abstraction/GameBddResult.cpp

@@ -13,8 +13,8 @@ namespace storm {
             // Intentionally left empty.
         }
         
-        template class GameBddResult<storm::dd::DdType::CUDD>;
-        template class GameBddResult<storm::dd::DdType::Sylvan>;
+        template struct GameBddResult<storm::dd::DdType::CUDD>;
+        template struct GameBddResult<storm::dd::DdType::Sylvan>;
         
     }
 }

src/storm/abstraction/jani/EdgeAbstractor.h

@@ -43,7 +43,7 @@ namespace storm {
         class AbstractionInformation;
 
         template <storm::dd::DdType DdType>
-        class BottomStateResult;
+        struct BottomStateResult;
 
         namespace jani {
             template <storm::dd::DdType DdType, typename ValueType>

src/storm/abstraction/prism/CommandAbstractor.h

@@ -42,7 +42,7 @@ namespace storm {
         class AbstractionInformation;
 
         template <storm::dd::DdType DdType>
-        class BottomStateResult;
+        struct BottomStateResult;
 
         namespace prism {
             template <storm::dd::DdType DdType, typename ValueType>

src/storm/builder/ExplicitModelBuilder.h

@@ -43,7 +43,7 @@ namespace storm {
         using namespace storm::generator;
         
         // Forward-declare classes.
-        template <typename ValueType> struct RewardModelBuilder;
+        template <typename ValueType> class RewardModelBuilder;
         class ChoiceInformationBuilder;
         
         template<typename ValueType, typename RewardModelType = storm::models::sparse::StandardRewardModel<ValueType>, typename StateType = uint32_t>

src/storm/generator/Choice.cpp

@@ -174,11 +174,11 @@ namespace storm {
             return out;
         }
         
-        template class Choice<double>;
+        template struct Choice<double>;
 
 #ifdef STORM_HAVE_CARL
-        template class Choice<storm::RationalNumber>;
-        template class Choice<storm::RationalFunction>;
+        template struct Choice<storm::RationalNumber>;
+        template struct Choice<storm::RationalFunction>;
 #endif
     }
 }

src/storm/modelchecker/exploration/SparseExplorationModelChecker.h

@@ -25,7 +25,7 @@ namespace storm {
             template <typename StateType, typename ValueType> class StateGeneration;
             template <typename StateType, typename ValueType> class ExplorationInformation;
             template <typename StateType, typename ValueType> class Bounds;
-            template <typename StateType, typename ValueType> class Statistics;
+            template <typename StateType, typename ValueType> struct Statistics;
         }
         
         using namespace exploration_detail;

src/storm/modelchecker/exploration/Statistics.cpp

@@ -39,7 +39,7 @@ namespace storm {
                 out << "EC detections: " << ecDetections << " (" << failedEcDetections << " failed, " << totalNumberOfEcDetected << " EC(s) detected)" << std::endl;
             }
          
-            template class Statistics<uint32_t, double>;
+            template struct Statistics<uint32_t, double>;
             
         }
     }

src/storm/parser/JaniParser.h

@@ -18,7 +18,7 @@ namespace storm {
         class Variable;
         class Composition;
         class Property;
-        class PropertyInterval;
+        struct PropertyInterval;
     }
     
     namespace logic {