aboutsummaryrefslogtreecommitdiff
path: root/ruby/repository.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 18:47:30 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 18:47:54 +0000
commit9c4b5b39a828509e752cb7d2888ff6e49d7694a6 (patch)
treec2a3c94b4b1e695a6a9f528a8b588814d25032a8 /ruby/repository.cc
parent682a8eb100360f6c2d68f2c960bcf3f9bf9db5f3 (diff)
downloadpaludis-9c4b5b39a828509e752cb7d2888ff6e49d7694a6.tar.gz
paludis-9c4b5b39a828509e752cb7d2888ff6e49d7694a6.tar.xz
Threads are now mandatory
Diffstat (limited to 'ruby/repository.cc')
-rw-r--r--ruby/repository.cc21
1 files changed, 4 insertions, 17 deletions
diff --git a/ruby/repository.cc b/ruby/repository.cc
index aad772c0a..26e6afb1a 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -28,16 +28,13 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
+#include <paludis/util/mutex.hh>
+#include <paludis/util/thread.hh>
+#include <paludis/util/condition_variable.hh>
#include <ruby.h>
#include <list>
#include <tr1/functional>
-#ifdef PALUDIS_ENABLE_THREADS
-# include <paludis/util/mutex.hh>
-# include <paludis/util/thread.hh>
-# include <paludis/util/condition_variable.hh>
-#endif
-
using namespace paludis;
using namespace paludis::ruby;
@@ -561,8 +558,7 @@ namespace
}
};
-#ifdef PALUDIS_ENABLE_THREADS
-# ifdef ENABLE_RUBY_QA
+#ifdef ENABLE_RUBY_QA
struct HackyReporter :
QAReporter
{
@@ -611,7 +607,6 @@ namespace
done = true;
cond.signal();
}
-# endif
#endif
/*
@@ -632,7 +627,6 @@ namespace
if ((**self_ptr).qa_interface())
{
RubyQAReporter qar(&reporter);
-#ifdef PALUDIS_ENABLE_THREADS
/* have to call ruby code in the original thread. icky. */
bool done(false);
std::list<std::tr1::function<void ()> > pending;
@@ -662,13 +656,6 @@ namespace
cond.wait(mutex);
}
}
-#else
- (**self_ptr).qa_interface()->check_qa(qar,
- value_to_qa_check_properties((ignore_if)),
- value_to_qa_check_properties((ignore_unless)),
- static_cast<QAMessageLevel>(NUM2INT(minumum_level)),
- FSEntry(StringValuePtr(dir)));
-#endif
}
#endif
return Qnil;