diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-14 11:15:41 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-14 11:15:41 +0000 |
commit | c0ae9d5915f52269ba387f037024d222d91b6bdd (patch) | |
tree | 487d15ee626f04759c6ef82305244541f71f9758 /src/GudhUI/gui/MainWindow.h | |
parent | 6af3c873fadc3eae10aa964dd0105ef095201911 (diff) | |
parent | f0e5330a88f9e89a887769ab79f6db6dd4e1c35a (diff) |
Merged trunc to branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1867 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 20d5120a0702522b632008bfc6a5257c70c849d1
Diffstat (limited to 'src/GudhUI/gui/MainWindow.h')
-rw-r--r-- | src/GudhUI/gui/MainWindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/GudhUI/gui/MainWindow.h b/src/GudhUI/gui/MainWindow.h index c8c3fcf6..3fe0d720 100644 --- a/src/GudhUI/gui/MainWindow.h +++ b/src/GudhUI/gui/MainWindow.h @@ -26,6 +26,9 @@ // Workaround for moc-qt4 not parsing boost headers #include <CGAL/config.h> +// Workaround https://svn.boost.org/trac/boost/ticket/12534 +#include <boost/container/flat_map.hpp> + #include <QMainWindow> #include "ui_main_window.h" #include "model/Model.h" |