Merge branch 'master' into prism-pomdp

src/storm-cli-utilities/cli.cpp

@@ -202,7 +202,7 @@ namespace storm {
             
             // If we were given a time limit, we put it in place now.
             if (resources.isTimeoutSet()) {
-                storm::utility::resources::setCPULimit(resources.getTimeoutInSeconds());
+                storm::utility::resources::setTimeoutAlarm(resources.getTimeoutInSeconds());
             }
 
             // register signal handler to handle aborts

src/storm/utility/resources.h

@@ -13,27 +13,6 @@ namespace storm {
     namespace utility {
         namespace resources {
 
-            /*!
-             * Get CPU limit.
-             * @return CPU limit in seconds.
-             */
-            inline std::size_t getCPULimit() {
-                rlimit rl;
-                getrlimit(RLIMIT_CPU, &rl);
-                return rl.rlim_cur;
-            }
-
-            /*!
-             * Set CPU limit.
-             * @param seconds CPU limit in seconds.
-             */
-            inline void setCPULimit(std::size_t seconds) {
-                rlimit rl;
-                getrlimit(RLIMIT_CPU, &rl);
-                rl.rlim_cur = seconds;
-                setrlimit(RLIMIT_CPU, &rl);
-            }
-
             /*!
              * Get used CPU time.
              * @return CPU time in seconds.