From 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 22:13:53 +0100
Subject: Use boost::signals2; fix bugs with x-thread signalling.

---
 src/lib/decoder_factory.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/decoder_factory.cc')

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 56fb56296..06377e26c 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -27,15 +27,15 @@
 #include "imagemagick_decoder.h"
 #include "film.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 
 shared_ptr<Decoder>
 decoder_factory (
 	shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false, bool ignore_length = false
 	)
 {
-	if (filesystem::is_directory (f->content_path ())) {
+	if (boost::filesystem::is_directory (f->content_path ())) {
 		/* Assume a directory contains TIFFs */
 		return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal, ignore_length));
 	}
-- 
cgit v1.2.3