From 8bf668665b107469086f16cb8ad23e47d479d2b4 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:14:37 +0200 Subject: 4.0 --- shared/loki/StrongPtr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared/loki/StrongPtr.h') diff --git a/shared/loki/StrongPtr.h b/shared/loki/StrongPtr.h index 23d70415..868eb48f 100644 --- a/shared/loki/StrongPtr.h +++ b/shared/loki/StrongPtr.h @@ -887,7 +887,7 @@ private: #ifdef LOKI_SMARTPTR_CONVERSION_CONSTRUCTOR_POLICY typedef typename Select< CP::allow, const StoredType&, NeverMatched>::Result ImplicitArg; - typedef typename Select::Result ExplicitArg; + typedef typename Select < !CP::allow, const StoredType&, NeverMatched >::Result ExplicitArg; #else typedef const StoredType& ImplicitArg; typedef typename Select::Result ExplicitArg; @@ -1678,7 +1678,7 @@ typename T, template < class > class CNP > struct less< Loki::StrongPtr< T, S, OP, CP, KP, RP, DP, CNP > > - : public binary_function< + : public binary_function < Loki::StrongPtr< T, S, OP, CP, KP, RP, DP, CNP >, Loki::StrongPtr< T, S, OP, CP, KP, RP, DP, CNP >, bool > { -- cgit