From 5b927a5c22028dd76fa04ad6d6b6ef3f62aafb77 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Thu, 2 Feb 2012 16:21:48 +0000
Subject: [PATCH] Fix merge error.

---
 trunk/src/nvtt/TaskDispatcher.h | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/trunk/src/nvtt/TaskDispatcher.h b/trunk/src/nvtt/TaskDispatcher.h
index 5ebf92b..c7224d0 100644
--- a/trunk/src/nvtt/TaskDispatcher.h
+++ b/trunk/src/nvtt/TaskDispatcher.h
@@ -18,8 +18,7 @@
 // http://msdn.microsoft.com/en-us/library/dd504870.aspx
 #if NV_OS_WIN32 && _MSC_VER >= 1600
 #define HAVE_PPL 1
-#include <array>
-//#include <ppl.h>
+#include <ppl.h>
 #endif
 
 // Intel Thread Building Blocks (TBB).
@@ -92,24 +91,9 @@ namespace nvtt {
 
 #if defined(HAVE_PPL)
 
-    class CountingIterator
-    {
-    public:
-        CountingIterator() : i(0) {}
-        CountingIterator(const CountingIterator & rhs) : i(0) {}
-        explicit CountingIterator(int x) : i(x) {}
-
-        const int & operator*() const { return i; }
-        CountingIterator & operator++() { i++; return *this; }
-        CountingIterator & operator--() { i--; return *this; }
-
-    private:
-        int i;
-    };
-
     struct TaskFunctor {
         TaskFunctor(Task * task, void * context) : task(task), context(context) {}
-        void operator()(int & n) const {
+        void operator()(int n) const {
             task(context, n);
         }
         Task * task;
@@ -121,12 +105,8 @@ namespace nvtt {
     {
         virtual void dispatch(Task * task, void * context, int count)
         {
-            CountingIterator begin(0);
-            CountingIterator end((int)count);
             TaskFunctor func(task, context);
-
-            std::for_each(begin, end, func);
-            //parallel_for_each(begin, end, func);
+            Concurrency::parallel_for(0, count, func);
         }
     };