2 files changed, 3 insertions, 3 deletions
diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile
index 1ce6df0..85d1c8c 100644
--- a/src/cuda-sim/Makefile
+++ b/src/cuda-sim/Makefile
@@ -55,10 +55,10 @@ endif
 
 CXX_OPT = $(OPT)
 ifeq ($(INTEL),1)
-    CXX_OPT += -std=c++11
+    CXX_OPT += -std=c++0x
 else 
 ifeq ($(GNUC_CPP0X),1)
-    CXX_OPT += -std=c++11
+    CXX_OPT += -std=c++0x
 endif
 endif
 
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc
index 1090ba4..9bdd53a 100644
--- a/src/cuda-sim/instructions.cc
+++ b/src/cuda-sim/instructions.cc
@@ -6561,7 +6561,7 @@ void video_mem_instruction(const ptx_instruction *pI, ptx_thread_info *thread, i
     case S32_TYPE: {
       // assert all operands are S32_TYPE:
       scalar_type = pI->get_scalar_type();
-      for (auto scalar : scalar_type)
+      for (std::list<int>::iterator scalar = scalar_type.begin(); scalar != scalar_type.end(); scalar++)
       {
         assert(scalar == S32_TYPE);
       }