Merge pull request #100 from slizzered/issue98-rename_uint_typedef

removed typedef uint32_richtig_huebsch
alpaka-group · Sep 24, 2015 · 3b91c67 · 3b91c67
2 parents b5737f7 + aeab138
commit 3b91c67
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/src/include/mallocMC/mallocMC_utils.hpp b/src/include/mallocMC/mallocMC_utils.hpp
@@ -40,6 +40,7 @@
 #include <string>
 #include <sstream>
 #include <stdexcept>
+#include <boost/cstdint.hpp>
 
 #include "mallocMC_prefixes.hpp"
 
@@ -100,7 +101,7 @@ namespace CUDA
 
 
 #define warp_serial                                    \
-  for (uint32_richtig_huebsch __mask = __ballot(1),                    \
+  for (unsigned int __mask = __ballot(1),              \
             __num = __popc(__mask),                    \
             __lanemask = mallocMC::lanemask_lt(),      \
             __local_id = __popc(__lanemask & __mask),  \
@@ -112,7 +113,6 @@ namespace CUDA
 
 namespace mallocMC 
 {
-  typedef unsigned int uint32_richtig_huebsch;
 
   template<int PSIZE>
   class __PointerEquivalent
@@ -130,70 +130,70 @@ namespace mallocMC
   typedef mallocMC::__PointerEquivalent<sizeof(char*)>::type PointerEquivalent;
 
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch laneid()
+  MAMC_ACCELERATOR inline uint32_t laneid()
   {
-    uint32_richtig_huebsch mylaneid;
+    uint32_t mylaneid;
     asm("mov.u32 %0, %laneid;" : "=r" (mylaneid));
     return mylaneid;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch warpid()
+  MAMC_ACCELERATOR inline uint32_t warpid()
   {
-    uint32_richtig_huebsch mywarpid;
+    uint32_t mywarpid;
     asm("mov.u32 %0, %warpid;" : "=r" (mywarpid));
     return mywarpid;
   }
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch nwarpid()
+  MAMC_ACCELERATOR inline uint32_t nwarpid()
   {
-    uint32_richtig_huebsch mynwarpid;
+    uint32_t mynwarpid;
     asm("mov.u32 %0, %nwarpid;" : "=r" (mynwarpid));
     return mynwarpid;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch smid()
+  MAMC_ACCELERATOR inline uint32_t smid()
   {
-    uint32_richtig_huebsch mysmid;
+    uint32_t mysmid;
     asm("mov.u32 %0, %smid;" : "=r" (mysmid));
     return mysmid;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch nsmid()
+  MAMC_ACCELERATOR inline uint32_t nsmid()
   {
-    uint32_richtig_huebsch mynsmid;
+    uint32_t mynsmid;
     asm("mov.u32 %0, %nsmid;" : "=r" (mynsmid));
     return mynsmid;
   }
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch lanemask()
+  MAMC_ACCELERATOR inline uint32_t lanemask()
   {
-    uint32_richtig_huebsch lanemask;
+    uint32_t lanemask;
     asm("mov.u32 %0, %lanemask_eq;" : "=r" (lanemask));
     return lanemask;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch lanemask_le()
+  MAMC_ACCELERATOR inline uint32_t lanemask_le()
   {
-    uint32_richtig_huebsch lanemask;
+    uint32_t lanemask;
     asm("mov.u32 %0, %lanemask_le;" : "=r" (lanemask));
     return lanemask;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch lanemask_lt()
+  MAMC_ACCELERATOR inline uint32_t lanemask_lt()
   {
-    uint32_richtig_huebsch lanemask;
+    uint32_t lanemask;
     asm("mov.u32 %0, %lanemask_lt;" : "=r" (lanemask));
     return lanemask;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch lanemask_ge()
+  MAMC_ACCELERATOR inline uint32_t lanemask_ge()
   {
-    uint32_richtig_huebsch lanemask;
+    uint32_t lanemask;
     asm("mov.u32 %0, %lanemask_ge;" : "=r" (lanemask));
     return lanemask;
   }
 
-  MAMC_ACCELERATOR inline uint32_richtig_huebsch lanemask_gt()
+  MAMC_ACCELERATOR inline uint32_t lanemask_gt()
   {
-    uint32_richtig_huebsch lanemask;
+    uint32_t lanemask;
     asm("mov.u32 %0, %lanemask_gt;" : "=r" (lanemask));
     return lanemask;
   }