From fe3c4a1aa3c009b25b011fb013910baa38b854bc Mon Sep 17 00:00:00 2001 From: ThomasH Date: Thu, 29 Oct 2015 15:29:01 +0100 Subject: [PATCH] add dependencies Former-commit-id: 50d1e41696c3beedc10cb8d16b856876da5fafb1 --- src/CMakeLists.txt | 4 +++- src/storage/gspn/Marking.cpp | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f3141a02..be35643c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -112,7 +112,9 @@ add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) target_link_libraries(storm-main storm) # Adding headers for xcode set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm") add_executable(storm-gspn ${STORM_GSPN_FILE}) -target_link_libraries(storm-gspn storm) +# CoreFoundation and CoreServices are linked for the XercesDOMParser +# libcurl ist needed for the xercesc library, but the dependency is missing (maybe resolved in the next version) +target_link_libraries(storm-gspn storm "-framework CoreFoundation -framework CoreServices -lcurl") target_link_libraries(storm ${STORM_LINK_LIBRARIES}) diff --git a/src/storage/gspn/Marking.cpp b/src/storage/gspn/Marking.cpp index 3e8b69106..e17c3d8df 100644 --- a/src/storage/gspn/Marking.cpp +++ b/src/storage/gspn/Marking.cpp @@ -19,7 +19,7 @@ namespace storm { } void Marking::setNumberOfTokensAt(uint_fast64_t place, uint_fast64_t numberOfTokens) { - //check range + //TODO check range (place < getNumberOfPlaces(), numberOfTokens < getMaxNumberOfTokens()) for (uint_fast64_t i = place * numberOfBits; i <(place * numberOfBits) + numberOfBits; ++i) { if (numberOfTokens % 2 == 0) { marking.set(i, false); @@ -39,5 +39,13 @@ namespace storm { } return tokens; } + + bool Marking::setNumberOfPlaces(uint_fast64_t numberOfPlaces) { + return false; + } + + bool Marking::setMaxNumberOfTokens(uint_fast64_t maxNumberOfTokens) { + return false; + } } } \ No newline at end of file