sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

use the correct storm_have_xerces flag now and fixed some wrong file inclusions that now appeared

tempestpy_adaptions
Sebastian Junges 8 years ago
parent
d676f768dc
commit
d5df27c935
8 changed files with 14 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      resources/3rdparty/include_xerces.cmake
  2. 2
      src/storm-gspn/adapters/XercesAdapter.h
  3. 4
      src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp
  4. 6
      src/storm-gspn/parser/GreatSpnEditorProjectParser.h
  5. 2
      src/storm-gspn/parser/GspnParser.cpp
  6. 4
      src/storm-gspn/parser/PnmlParser.cpp
  7. 6
      src/storm-gspn/parser/PnmlParser.h
  8. 2
      storm-config.h.in

1
resources/3rdparty/include_xerces.cmake
View File

@ -43,5 +43,6 @@ if(USE_XERCESC)
find_package(CURL) find_package(CURL)
list(APPEND STORM_GSPN_LINK_LIBRARIES ${XercesC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES}) list(APPEND STORM_GSPN_LINK_LIBRARIES ${XercesC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
else() else()
set(STORM_HAVE_XERCES OFF)
message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)") message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)")
endif(USE_XERCESC) endif(USE_XERCESC)

2
src/storm-gspn/adapters/XercesAdapter.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "storm-config.h" #include "storm-config.h"
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
#include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/util/XMLString.hpp> #include <xercesc/util/XMLString.hpp>

4
src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp
View File

@ -1,9 +1,9 @@
#include "GreatSpnEditorProjectParser.h" #include "GreatSpnEditorProjectParser.h"
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
#include <iostream> #include <iostream>
#include "storm/adapters/XercesAdapter.h"
#include "storm-gspn/adapters/XercesAdapter.h"
#include "storm/exceptions/UnexpectedException.h" #include "storm/exceptions/UnexpectedException.h"
#include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/WrongFormatException.h"

6
src/storm-gspn/parser/GreatSpnEditorProjectParser.h
View File

@ -1,15 +1,15 @@
#pragma once #pragma once
#include "storm-config.h" #include "storm-config.h"
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
#include <string> #include <string>
#include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/util/XMLString.hpp> #include <xercesc/util/XMLString.hpp>
#include "storm/storage/gspn/GSPN.h"
#include "storm-gspn/storage/gspn/GSPN.h"
#include "storm/storage/gspn/GspnBuilder.h"
#include "storm-gspn/storage/gspn/GspnBuilder.h"
namespace storm { namespace storm {
namespace parser { namespace parser {

2
src/storm-gspn/parser/GspnParser.cpp
View File

@ -13,7 +13,7 @@ namespace storm {
namespace parser { namespace parser {
storm::gspn::GSPN* GspnParser::parse(std::string const& filename) { storm::gspn::GSPN* GspnParser::parse(std::string const& filename) {
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
// initialize xercesc // initialize xercesc
try { try {
xercesc::XMLPlatformUtils::Initialize(); xercesc::XMLPlatformUtils::Initialize();

4
src/storm-gspn/parser/PnmlParser.cpp
View File

@ -1,9 +1,9 @@
#include "storm-gspn/parser/PnmlParser.h" #include "storm-gspn/parser/PnmlParser.h"
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
#include <iostream> #include <iostream>
#include "storm/adapters/XercesAdapter.h"
#include "storm-gspn/adapters/XercesAdapter.h"
#include "storm/exceptions/UnexpectedException.h" #include "storm/exceptions/UnexpectedException.h"
#include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/WrongFormatException.h"

6
src/storm-gspn/parser/PnmlParser.h
View File

@ -1,14 +1,14 @@
#pragma once #pragma once
#include "storm-config.h" #include "storm-config.h"
#ifdef USE_XERCES
#ifdef STORM_HAVE_XERCES
#include <string> #include <string>
#include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/util/XMLString.hpp> #include <xercesc/util/XMLString.hpp>
#include "storm/storage/gspn/GSPN.h"
#include "storm-gspn/storage/gspn/GSPN.h"
#include "storm/storage/gspn/GspnBuilder.h"
#include "storm-gspn/storage/gspn/GspnBuilder.h"
namespace storm { namespace storm {
namespace parser { namespace parser {

2
storm-config.h.in
View File

@ -55,7 +55,7 @@
#cmakedefine STORM_USE_CLN_NUMBERS #cmakedefine STORM_USE_CLN_NUMBERS
#cmakedefine USE_XERCES
#cmakedefine STORM_HAVE_XERCES
// Whether smtrat is available and to be used. // Whether smtrat is available and to be used.
#cmakedefine STORM_HAVE_SMTRAT #cmakedefine STORM_HAVE_SMTRAT

Write Preview
Loading…
Cancel
Save