Merge pull request #4 from qqldd/upstream_master

Add .gitignore file to ignore files generated after building + some MAC compilation issues,

3 files changed, 9 insertions, 3 deletions

diff --git a/src/gpuwattch/cacti/cacti.mk b/src/gpuwattch/cacti/cacti.mk
index 1de6e9e..7f3c573 100644
--- a/src/gpuwattch/cacti/cacti.mk
+++ b/src/gpuwattch/cacti/cacti.mk
@@ -54,7 +54,7 @@ $(OUTPUT_DIR)/Makefile.makedepend: depend
 
 depend:
 	touch $(OUTPUT_DIR)/Makefile.makedepend
-	makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ -a $(SRCS) 2> /dev/null
+	makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ $(SRCS) 2> /dev/null
 
 $(OUTPUT_DIR)/%.o : %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
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();