Merge branch 'master' into slack_histogram

1 files changed, 2 insertions, 1 deletions

diff --git a/gui/basewindow.h b/gui/basewindow.h
index 5cec24c5..341cc8e2 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -45,7 +45,7 @@ class BaseMainWindow : public QMainWindow
     Q_OBJECT

 

   public:

-    explicit BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent = 0);

+    explicit BaseMainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent = 0);

     virtual ~BaseMainWindow();

     Context *getContext() { return ctx.get(); }

 

@@ -88,6 +88,7 @@ class BaseMainWindow : public QMainWindow
 

   protected:

     // state variables

+    ArchArgs chipArgs;

     std::unique_ptr<Context> ctx;

     TaskManager *task;

     bool timing_driven;