From 40bd3305fbeb0261550b82171cadde22cd2557b9 Mon Sep 17 00:00:00 2001
From: syntheticpp <syntheticpp@7ec92016-0320-0410-acc4-a06ded1c099a>
Date: Mon, 2 Jan 2006 08:36:51 +0000
Subject: [PATCH] speed optimization: pass by reference but store value in case
 of Functor parameters

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@390 7ec92016-0320-0410-acc4-a06ded1c099a
---
 include/loki/Functor.h | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/include/loki/Functor.h b/include/loki/Functor.h
index c3f0726..4ba1872 100644
--- a/include/loki/Functor.h
+++ b/include/loki/Functor.h
@@ -1332,12 +1332,6 @@ namespace Loki
     {
         template <class Fctor> struct BinderFirstTraits;
 
-        template<class T>
-        struct BinderFirstTraits
-        {
-            typedef typename TypeTraits<T>::ParameterType ByRefOrValue;
-        };
-
         template <typename R, class TList, template <class> class ThreadingModel>
         struct BinderFirstTraits< Functor<R, TList, ThreadingModel> >
         {
@@ -1353,10 +1347,27 @@ namespace Loki
 
             typedef typename BoundFunctorType::Impl Impl;
 
-            typedef typename TypeTraits<OriginalFunctor>::ReferredType ByRefOrValue;
         };  
 
-    }
+
+		template<class T>
+        struct BinderFirstBoundTypeStorage;
+
+		template<class T>
+        struct BinderFirstBoundTypeStorage
+        {
+            typedef typename TypeTraits<T>::ParameterType RefOrValue;
+        };
+		
+		template <typename R, class TList, template <class> class ThreadingModel>
+        struct BinderFirstBoundTypeStorage< Functor<R, TList, ThreadingModel> >
+        {
+			typedef Functor<R, TList, ThreadingModel> OriginalFunctor;
+            typedef typename const TypeTraits<OriginalFunctor>::ReferredType RefOrValue;
+        };  
+
+
+    } // namespace Private
 
 ////////////////////////////////////////////////////////////////////////////////
 ///  \class BinderFirst
@@ -1372,11 +1383,13 @@ namespace Loki
         typedef typename Private::BinderFirstTraits<OriginalFunctor>::Impl Base;
         typedef typename OriginalFunctor::ResultType ResultType;
 
-        typedef typename Private::BinderFirstTraits<
+		typedef typename OriginalFunctor::Parm1 BoundType;
+
+        typedef typename Private::BinderFirstBoundTypeStorage<
                              typename Private::BinderFirstTraits<OriginalFunctor>
                              ::OriginalParm1>
-                         ::ByRefOrValue
-                BoundType;
+                         ::RefOrValue
+                BoundTypeStorage;
                         
         typedef typename OriginalFunctor::Parm2 Parm1;
         typedef typename OriginalFunctor::Parm3 Parm2;
@@ -1466,7 +1479,7 @@ namespace Loki
         
     private:
         OriginalFunctor f_;
-        BoundType b_;
+        BoundTypeStorage b_;
     };
     
 ////////////////////////////////////////////////////////////////////////////////
@@ -1478,10 +1491,7 @@ namespace Loki
     typename Private::BinderFirstTraits<Fctor>::BoundFunctorType
     BindFirst(
         const Fctor& fun, 
-        typename Private::BinderFirstTraits<
-                     typename Private::BinderFirstTraits<Fctor>
-                     ::OriginalParm1>
-                 ::ByRefOrValue bound)
+		typename Fctor::Parm1 bound)
     {
         typedef typename Private::BinderFirstTraits<Fctor>::BoundFunctorType
             Outgoing;