summaryrefslogtreecommitdiff
path: root/src/lib/job.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
commit63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch)
treed248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/job.cc
parent977b36672892b14de4ecb68e98415c64946e8a93 (diff)
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/job.cc')
-rw-r--r--src/lib/job.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc
index a7c2430b8..c5a254a2a 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -27,8 +27,10 @@
#include "job.h"
#include "util.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::stringstream;
+using boost::shared_ptr;
/** @param s Film that we are operating on.
*/
@@ -64,7 +66,7 @@ Job::run_wrapper ()
set_progress (1);
set_state (FINISHED_ERROR);
- set_error (String::compose ("%1 (%2)", e.what(), filesystem::path (e.filename()).leaf()));
+ set_error (String::compose ("%1 (%2)", e.what(), boost::filesystem::path (e.filename()).leaf()));
} catch (std::exception& e) {