Merge pull request #3 from gpgpu-sim/dev

Dev

2 files changed, 2 insertions, 2 deletions

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 3773f6f..ec68b5b 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -1308,7 +1308,7 @@ void function_info::list_param( FILE *fout ) const
 
 void function_info::ptx_jit_config(std::map<unsigned long long, size_t> mallocPtr_Size, memory_space *param_mem, gpgpu_t* gpu, dim3 gridDim, dim3 blockDim) 
 {
-    static unsigned long counter = 0;
+    static unsigned long long counter = 0;
     std::vector< std::pair<size_t, unsigned char*> > param_data;
     std::vector<unsigned> offsets;
     std::vector<bool> paramIsPointer;
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc
index 31a33c6..c85654c 100644
--- a/src/cuda-sim/instructions.cc
+++ b/src/cuda-sim/instructions.cc
@@ -195,7 +195,7 @@ void ptx_thread_info::print_reg_thread(char * fname)
   {  
   reg_map_t reg = m_regs.back();
   
-      typename reg_map_t::const_iterator it;
+      reg_map_t::const_iterator it;
       for (it = reg.begin(); it != reg.end(); ++it) 
         {
           const std::string &name = it->first->name();