Merge commit '788bc67faa7738cf7c6b2a192ecf3e3567d1c20e' into develop

2015-08-28 12:42:03 +02:00
parent 8e1f70865e 788bc67faa
commit 048be2da2c
150 changed files with 12325 additions and 4321 deletions
@@ -59,7 +59,6 @@ TEST_CASE("thread") {
        auto& pool = osmium::thread::Pool::instance();
        result = 0;

-        bool got_exception = false;
        auto future = pool.submit(test_job_throw {});

        REQUIRE_THROWS_AS(future.get(), std::runtime_error);