minor fixes to make storm work with boost 1.62

Former-commit-id: 8d17816efa [formerly f15df8c906]
Former-commit-id: 6030612d78

resources/3rdparty/CMakeLists.txt

@@ -64,7 +64,7 @@ set(Boost_USE_STATIC_LIBS        ${USE_BOOST_STATIC_LIBRARIES})
 set(Boost_USE_MULTITHREADED      ON)
 set(Boost_USE_STATIC_RUNTIME    OFF)
 
-find_package(Boost 1.57.0 QUIET REQUIRED COMPONENTS filesystem)
+find_package(Boost 1.57.0 QUIET REQUIRED COMPONENTS filesystem system)
 
 if ((NOT Boost_LIBRARY_DIRS) OR ("${Boost_LIBRARY_DIRS}" STREQUAL ""))
     set(Boost_LIBRARY_DIRS "${Boost_INCLUDE_DIRS}/stage/lib")

resources/3rdparty/cpptemplate/cpptempl.h

@@ -171,7 +171,7 @@ namespace cpptempl
 	public:
 		TemplateException(std::string reason) : m_reason(reason){}
 		~TemplateException() throw() {}
-		const char* what() throw() {
+		const char* what() const throw() {
 			return m_reason.c_str();
 		}
 	private:
@@ -182,6 +182,9 @@ namespace cpptempl
 	class Data
 	{
 	public:
+        virtual ~Data() {
+            // Intentionally left empty.
+        }
 		virtual bool empty() = 0 ;
 		virtual wstring getvalue();
 		virtual data_list& getlist();

src/adapters/Z3ExpressionAdapter.cpp

@@ -1,11 +1,12 @@
+#include "src/adapters/Z3ExpressionAdapter.h"
 
-#include "Z3ExpressionAdapter.h"
 #include "src/storage/expressions/Expressions.h"
 #include "src/storage/expressions/ExpressionManager.h"
 #include "src/utility/macros.h"
 #include "src/exceptions/ExpressionEvaluationException.h"
 #include "src/exceptions/InvalidTypeException.h"
 #include "src/exceptions/NotImplementedException.h"
+
 namespace storm {
     namespace adapters {
 

src/storage/expressions/ExpressionVisitor.h

@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_EXPRESSIONVISITOR_H_
 
 #include <boost/any.hpp>
+#include <boost/none.hpp>
 
 namespace storm {
     namespace expressions {
@@ -33,4 +34,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONVISITOR_H_ */
+#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONVISITOR_H_ */

src/storage/expressions/LinearCoefficientVisitor.cpp

@@ -155,4 +155,4 @@ namespace storm {
             return VariableCoefficients(expression.getValueAsDouble());
         }
     }
-}
+}

src/storage/expressions/LinearityCheckVisitor.cpp

@@ -1,4 +1,5 @@
 #include "src/storage/expressions/LinearityCheckVisitor.h"
+
 #include "src/storage/expressions/Expressions.h"
 
 #include "src/utility/macros.h"
@@ -89,4 +90,4 @@ namespace storm {
             return LinearityStatus::LinearWithoutVariables;
         }
     }
-}
+}