4 files changed, 10 insertions, 4 deletions
diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h
index 610efa2..f926e6d 100644
--- a/src/cuda-sim/ptx_sim.h
+++ b/src/cuda-sim/ptx_sim.h
@@ -470,7 +470,7 @@ private:
    std::list<reg_map_t> m_debug_trace_regs_read;
    bool m_enable_debug_trace;
 
-   std::stack<class operand_info> m_breakaddrs;
+   std::stack<class operand_info, std::vector<operand_info> > m_breakaddrs;
 };
 
 addr_t generic_to_local( unsigned smid, unsigned hwtid, addr_t addr );
diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h
index cf7160f..1aa468b 100644
--- a/src/gpgpu-sim/shader.h
+++ b/src/gpgpu-sim/shader.h
@@ -1331,7 +1331,7 @@ struct shader_core_config : public core_config
 
 struct shader_core_stats_pod {
 
-	void* shader_core_stats_pod_start[]; // DO NOT MOVE FROM THE TOP - spaceless pointer to the start of this structure
+	void* shader_core_stats_pod_start[0]; // DO NOT MOVE FROM THE TOP - spaceless pointer to the start of this structure
 	unsigned long long *shader_cycles;
     unsigned *m_num_sim_insn; // number of scalar thread instructions committed by this shader core
     unsigned *m_num_sim_winsn; // number of warp instructions committed by this shader core
diff --git a/src/gpuwattch/cacti/nuca.cc b/src/gpuwattch/cacti/nuca.cc
index 9518791..f31b0c8 100644
--- a/src/gpuwattch/cacti/nuca.cc
+++ b/src/gpuwattch/cacti/nuca.cc
@@ -42,8 +42,13 @@ unsigned int MIN_BANKSIZE=65536;
 
 int cont_stats[2 /*l2 or l3*/][5/* cores */][ROUTER_TYPES][7 /*banks*/][8 /* cycle time */];
 
-  Nuca::Nuca(
-      TechnologyParameter::DeviceType *dt = &(g_tp.peri_global)
+Nuca::Nuca():deviceType(&(g_tp.peri_global))
+{
+  init_cont();
+}
+
+Nuca::Nuca(
+      TechnologyParameter::DeviceType *dt
       ):deviceType(dt)
 {
   init_cont();
diff --git a/src/gpuwattch/cacti/nuca.h b/src/gpuwattch/cacti/nuca.h
index 89fec19..bbdee7d 100644
--- a/src/gpuwattch/cacti/nuca.h
+++ b/src/gpuwattch/cacti/nuca.h
@@ -75,6 +75,7 @@ class nuca_org_t {
 class Nuca : public Component
 {
   public:
+    Nuca();
     Nuca(
         TechnologyParameter::DeviceType *dt);
     void print_router();