diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-06-07 19:24:07 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-06-07 19:24:07 (GMT) |
| commit | 0df515b46696d95a4c50bb9383105bef2f78236e (patch) | |
| tree | 1df73b453d364c8eeecffb35ea8c5e49493e5698 | |
| parent | af89e263226174989bbd9d7ce993846c8fb6fc07 (diff) | |
build fix for gcc 4.7, fedora 17
| -rwxr-xr-x | scripts/uni-get-dependencies.sh | 5 | ||||
| -rw-r--r-- | src/mainwin.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index e2fdaa7..f5ace44 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -7,8 +7,9 @@ get_fedora_deps() { sudo yum install qt-devel bison flex eigen2-devel python-paramiko \ - boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig \ - git libXmu-devel curl imagemagick + boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \ + opencsg-devel git libXmu-devel curl imagemagick ImageMagick make \ + xorg-x11-server-Xvfb } get_qomo_deps() diff --git a/src/mainwin.cc b/src/mainwin.cc index 946bc2a..d10337d 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -655,7 +655,11 @@ bool MainWindow::compile(bool reload, bool procevents) if (procevents) QApplication::processEvents(); AbstractNode::resetIndexCounter(); - this->root_inst = ModuleInstantiation("group"); + + // split these two lines - gcc 4.7 bug + ModuleInstantiation mi = ModuleInstantiation( "group" ); + this->root_inst = mi; + this->absolute_root_node = this->root_module->instantiate(&top_ctx, &this->root_inst, NULL); if (this->absolute_root_node) { |