From 0c46b36ed5c52f0003f0cd45195bdee1193a2a33 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan
Date: Wed, 6 Feb 2013 12:36:13 -0800
Subject: gruel: renamed mask to dword_mask

---
 gnuradio-core/src/lib/runtime/gr_block_detail.cc |  1 +
 gruel/src/lib/thread.cc                          | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
index e6199be37..fdcde85a0 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
@@ -26,6 +26,7 @@
 
 #include <gr_block_detail.h>
 #include <gr_buffer.h>
+#include <iostream>
 
 using namespace pmt;
 
diff --git a/gruel/src/lib/thread.cc b/gruel/src/lib/thread.cc
index ab022c0bd..8ebe822fb 100644
--- a/gruel/src/lib/thread.cc
+++ b/gruel/src/lib/thread.cc
@@ -61,14 +61,14 @@ namespace gruel {
   thread_bind_to_processor(gr_thread_t thread, const std::vector<unsigned int> &mask)
   {
     //DWORD_PTR mask = (1 << n);
-    DWORD_PTR mask = 0;
+    DWORD_PTR dword_mask = 0;
 
     std::vector<unsigned int> _mask = mask;
     std::vector<unsigned int>::iterator itr;
     for(itr = _mask.begin(); itr != _mask.end(); itr++)
-      mask |= (1 << (*itr));
+      dword_mask |= (1 << (*itr));
 
-    DWORD_PTR ret = SetThreadAffinityMask(thread, mask);
+    DWORD_PTR ret = SetThreadAffinityMask(thread, dword_mask);
     if(ret == 0) {
       std::stringstream s;
       s << "thread_bind_to_processor failed with error: " << GetLastError() << std::endl;
@@ -79,14 +79,14 @@ namespace gruel {
   void
   thread_unbind()
   {
-    thread_bind_unbind(get_current_thread_id());
+    thread_unbind(get_current_thread_id());
   }
 
   void
   thread_unbind(gr_thread_t thread)
   {
-    DWORD_PTR mask = sizeof(DWORD_PTR) - 1;
-    DWORD_PTR ret = SetThreadAffinityMask(thread, mask);
+    DWORD_PTR dword_mask = sizeof(DWORD_PTR) - 1;
+    DWORD_PTR ret = SetThreadAffinityMask(thread, dword_mask);
     if(ret == 0) {
       std::stringstream s;
       s << "thread_unbind failed with error: " << GetLastError() << std::endl;
-- 
cgit