From 2d31480bf052e3176edfbdc914ff5a29d54dc46c Mon Sep 17 00:00:00 2001
From: Sebastien Braun
Date: Sun, 10 Oct 2010 01:41:48 +0200
Subject: Introduce an implicit logical AND into Require policy

---
 src/input/inputEventHandler.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/input/inputEventHandler.h b/src/input/inputEventHandler.h
index 735b75c..46e688c 100644
--- a/src/input/inputEventHandler.h
+++ b/src/input/inputEventHandler.h
@@ -92,12 +92,12 @@ typedef Security<AllowEverybody> Unprivileged;
 //  as porting efforts are already underway, we include the necessary
 //  machinery anyway.
 /////////////////////////////////////////////////////////////////////////
-template<typename SystemTrait>
+template<IMPLICIT_TYPE_LIST_PARAMS(Trait)>
 BEGIN_POLICY_CLASS(Require)
 {
 	static const bool areSystemRequirementsFulfilled =
-			NextPolicy::areSystemRequirementsFulfilled &&
-			detail::Matches<SystemTrait, detail::SystemTraits>::value;
+			NextPolicy::areSystemRequirementsFulfilled ||
+			detail::Matches<AllOf<IMPLICIT_TYPE_LIST_ARGS(Trait)>, detail::SystemTraits>::value;
 }
 END_POLICY_CLASS
 
-- 
cgit v1.2.3-55-g7522