From 8d59e1c91ecbaf1ed2bd879849d7ee9f91444343 Mon Sep 17 00:00:00 2001 From: PBerger Date: Sun, 22 Sep 2013 21:47:37 +0200 Subject: [PATCH 1/2] Removed an config input file from the repo Former-commit-id: 5019b5d84c0175a5ceb95ae5dda7b4d9549ddb3b --- .../include/log4cplus/config/defines.hxx | 256 ------------------ 1 file changed, 256 deletions(-) delete mode 100644 resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx diff --git a/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx b/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx deleted file mode 100644 index b7d3b9da8..000000000 --- a/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx +++ /dev/null @@ -1,256 +0,0 @@ -#ifndef LOG4CPLUS_CONFIG_DEFINES_HXX -#define LOG4CPLUS_CONFIG_DEFINES_HXX - -/* */ -#define LOG4CPLUS_HAVE_SYSLOG_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ARPA_INET_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETINET_IN_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETINET_TCP_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TIMEB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TIME_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TYPES_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_STAT_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_SYSCALL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_FILE_H 1 - -/* */ -#define LOG4CPLUS_HAVE_TIME_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_SOCKET_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETDB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_UNISTD_H 1 - -/* */ -#define LOG4CPLUS_HAVE_FCNTL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDARG_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDIO_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDLIB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ERRNO_H 1 - -/* */ -#define LOG4CPLUS_HAVE_WCHAR_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ICONV_H 1 - -/* */ -#define LOG4CPLUS_HAVE_LIMITS_H 1 - -/* */ -#define LOG4CPLUS_HAVE_FTIME 1 - -/* */ -#define LOG4CPLUS_HAVE_GETADDRINFO 1 - -/* */ -#define LOG4CPLUS_HAVE_GETHOSTBYNAME_R 1 - -/* */ -#define LOG4CPLUS_HAVE_GETPID 1 - -/* */ -#define LOG4CPLUS_HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `clock_gettime' function. */ -#define LOG4CPLUS_HAVE_CLOCK_GETTIME 1 - -/* Define to 1 if you have the `nanosleep' function. */ -#define LOG4CPLUS_HAVE_NANOSLEEP 1 - -/* Define to 1 if you have the `clock_nanosleep' function. */ -#define LOG4CPLUS_HAVE_CLOCK_NANOSLEEP 1 - -/* */ -#define LOG4CPLUS_HAVE_GMTIME_R 1 - -/* */ -#define LOG4CPLUS_HAVE_HTONL 1 - -/* */ -#define LOG4CPLUS_HAVE_HTONS 1 - -/* */ -#define LOG4CPLUS_HAVE_LOCALTIME_R 1 - -/* */ -#define LOG4CPLUS_HAVE_LSTAT 1 - -/* */ -#define LOG4CPLUS_HAVE_FCNTL 1 - -/* */ -#define LOG4CPLUS_HAVE_LOCKF 1 - -/* */ -#define LOG4CPLUS_HAVE_FLOCK 1 - -/* */ -#define LOG4CPLUS_HAVE_NTOHL 1 - -/* */ -#define LOG4CPLUS_HAVE_NTOHS 1 - -/* */ -#define LOG4CPLUS_HAVE_PIPE 1 - -/* */ -#define LOG4CPLUS_HAVE_PIPE2 1 - -/* */ -#define LOG4CPLUS_HAVE_POLL 1 - -/* */ -#define LOG4CPLUS_HAVE_POLL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STAT 1 - -/* Define if this is a single-threaded library. */ -/* #undef LOG4CPLUS_SINGLE_THREADED */ - -/* */ -/* #undef LOG4CPLUS_USE_PTHREADS */ - -/* Define for compilers/standard libraries that support more than just the "C" - locale. */ -/* #undef LOG4CPLUS_WORKING_LOCALE */ - -/* Define for C99 compilers/standard libraries that support more than just the - "C" locale. */ -/* #undef LOG4CPLUS_WORKING_C_LOCALE */ - -/* Define to int if undefined. */ -/* #undef socklen_t */ - -/* Defined for --enable-debugging builds. */ -/* #undef LOG4CPLUS_DEBUGGING */ - -/* Defined if the compiler understands __declspec(dllexport) or - __attribute__((visibility("default"))) construct. */ -#define LOG4CPLUS_DECLSPEC_EXPORT __attribute__ ((visibility("default"))) - -/* Defined if the compiler understands __declspec(dllimport) or - __attribute__((visibility("default"))) construct. */ -#define LOG4CPLUS_DECLSPEC_IMPORT __attribute__ ((visibility("default"))) - -/* Defined if the compiler understands - __attribute__((visibility("hidden"))) construct. */ -#define LOG4CPLUS_DECLSPEC_PRIVATE __attribute__ ((visibility("hidden"))) - -/* */ -#define LOG4CPLUS_HAVE_TLS_SUPPORT 1 - -/* */ -#define LOG4CPLUS_THREAD_LOCAL_VAR __thread - -/* Defined if the host OS provides ENAMETOOLONG errno value. */ -#define LOG4CPLUS_HAVE_ENAMETOOLONG 1 - -/* Defined if the compiler provides __sync_add_and_fetch(). */ -#define LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH 1 - -/* Defined if the compiler provides __sync_sub_and_fetch(). */ -#define LOG4CPLUS_HAVE___SYNC_SUB_AND_FETCH 1 - -/* Defined if the compiler provides C++11 header and increment, - decrement operations. */ -/* #undef LOG4CPLUS_HAVE_CXX11_ATOMICS */ - -/* */ -#define LOG4CPLUS_HAVE_C99_VARIADIC_MACROS 1 - -/* */ -#define LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS 1 - -/* */ -#define LOG4CPLUS_HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `vsnwprintf' function. */ -/* #undef LOG4CPLUS_HAVE_VSNWPRINTF */ - -/* Define to 1 if you have the `_vsnwprintf' function. */ -/* #undef LOG4CPLUS_HAVE__VSNWPRINTF */ - -/* */ -/* #undef LOG4CPLUS_HAVE__VSNPRINTF */ - -/* Define to 1 if you have the `vfprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VFPRINTF_S */ - -/* Define to 1 if you have the `vfwprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VFWPRINTF_S */ - -/* Define to 1 if you have the `vsprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VSPRINTF_S */ - -/* Define to 1 if you have the `vswprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VSWPRINTF_S */ - -/* Define to 1 if you have the `_vsnprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE__VSNPRINTF_S */ - -/* Define to 1 if you have the `_vsnwprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE__VSNWPRINTF_S */ - -/* Defined if the compiler supports __FUNCTION__ macro. */ -#define LOG4CPLUS_HAVE_FUNCTION_MACRO 1 - -/* Defined if the compiler supports __PRETTY_FUNCTION__ macro. */ -#define LOG4CPLUS_HAVE_PRETTY_FUNCTION_MACRO 1 - -/* Defined if the compiler supports __func__ symbol. */ -#define LOG4CPLUS_HAVE_FUNC_SYMBOL 1 - -/* Define to 1 if you have the `mbstowcs' function. */ -#define LOG4CPLUS_HAVE_MBSTOWCS 1 - -/* Define to 1 if you have the `wcstombs' function. */ -#define LOG4CPLUS_HAVE_WCSTOMBS 1 - -/* Define to 1 if you have Linux style syscall(SYS_gettid). */ -#define LOG4CPLUS_HAVE_GETTID 1 - -/* Define when iconv() is available. */ -/* #undef LOG4CPLUS_WITH_ICONV */ - -/* Define to 1 if you have the `iconv' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV */ - -/* Define to 1 if you have the `iconv_close' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV_CLOSE */ - -/* Define to 1 if you have the `iconv_open' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV_OPEN */ - -#endif // LOG4CPLUS_CONFIG_DEFINES_HXX From cb1c3965ba342fa55dc6b4b8b4543142d6c21d5b Mon Sep 17 00:00:00 2001 From: PBerger Date: Sun, 22 Sep 2013 21:48:09 +0200 Subject: [PATCH 2/2] Removed a wrong and unnecessary validation function from ExplicitModelAdapter.cpp Former-commit-id: 9f1aeaf27c1c9cb42fa26bc16360ad2680f30b11 --- src/adapters/ExplicitModelAdapter.cpp | 42 +-------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/src/adapters/ExplicitModelAdapter.cpp b/src/adapters/ExplicitModelAdapter.cpp index 9c20eca69..3963ec81b 100644 --- a/src/adapters/ExplicitModelAdapter.cpp +++ b/src/adapters/ExplicitModelAdapter.cpp @@ -27,47 +27,7 @@ extern log4cplus::Logger logger; bool ExplicitModelAdapterOptionsRegistered = storm::settings::Settings::registerNewModule([] (storm::settings::Settings* instance) -> bool { - instance->addOption(storm::settings::OptionBuilder("ExplicitModelAdapter", "constants", "", "Specifies the constant replacements to use in Explicit Models").addArgument(storm::settings::ArgumentBuilder::createStringArgument("constantString", "A comma separated list of constants and their value, e.g. a=1,b=2,c=3").addValidationFunctionString( - [] (std::string const s, std::string& errorMessageTarget) -> bool { - // since regex is not yet implemented in gccs C++11, we have to check by hand - std::vector constants; - // split for single assignment expressions - boost::split(constants, s, boost::is_any_of(",")); - for (auto it = constants.cbegin(); it != constants.cend(); ++it) { - std::vector constant; - boost::split(constant, *it, boost::is_any_of("=")); - if (constant.size() != 2) { - std::ostringstream stream; - stream << "Expected one \"=\" in constant definition: \"" << *it << "\"" << std::endl; - errorMessageTarget.append(stream.str()); - return false; - } - // Constant Name check - bool error = false; - std::for_each(constant.at(0).cbegin(), constant.at(0).cend(), [&error, &errorMessageTarget] (const std::string::value_type value) -> void { - if (!(('a' <= value && value <= 'z') || ('A' <= value && value <= 'Z') || ('0' <= value && value <= '9'))) { - std::ostringstream stream; - stream << "Illegal character in constant name: \"" << value << "\"" << std::endl; - errorMessageTarget.append(stream.str()); - error = true; - } - }); - // Value Check - std::for_each(constant.at(1).cbegin(), constant.at(1).cend(), [&error, &errorMessageTarget] (const std::string::value_type value) -> void { - if (!(('a' <= value && value <= 'z') || ('A' <= value && value <= 'Z') || ('0' <= value && value <= '9'))) { - std::ostringstream stream; - stream << "Illegal character in constant value: \"" << value << "\"" << std::endl; - errorMessageTarget.append(stream.str()); - error = true; - } - }); - if (error) { - return false; - } - } - - return true; - }).setDefaultValueString("").build()).build()); + instance->addOption(storm::settings::OptionBuilder("ExplicitModelAdapter", "constants", "", "Specifies the constant replacements to use in Explicit Models").addArgument(storm::settings::ArgumentBuilder::createStringArgument("constantString", "A comma separated list of constants and their value, e.g. a=1,b=2,c=3").setDefaultValueString("").build()).build()); return true; });