commit 1df9869492533852b6a7989e3e8dc07cef7b89b5
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 18 17:54:22 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 18 17:54:22 2013 -0800
tree 2438b5f5fd4f6eab9391833a0304c06980eb6a86
parent 66ddb23e5e693cae89ea8590dff9eb0c38eb49e2
parent fb4c43f5a856571be0307a1f0e68cca9a9ffd3de

Merge branch 'master' of git.irl.cs.ucla.edu:ndn/chronoshare

scheduler/scheduler.cc

diff --git a/scheduler/scheduler.cc b/scheduler/scheduler.cc
index e12b64c..029be5c 100644
--- a/scheduler/scheduler.cc
+++ b/scheduler/scheduler.cc
@@ -114,7 +114,7 @@
   return false;
 }
 
-virtual void
+void
 Scheduler::deleteTask(TaskPtr task)
 {
   deleteTask (task->tag ());

wscript

diff --git a/wscript b/wscript
index 37c5678..49ab31f 100644
--- a/wscript
+++ b/wscript
@@ -109,6 +109,6 @@
 	features = "qt4 cxx cxxprogram",
 	defines = "WAF",
 	source = bld.path.ant_glob(['gui/*.cpp']),
-	includes = "chronosharegui . ",
+	includes = "gui . ",
 	use = "QTCORE QTGUI"
 	)