diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-16 09:20:20 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-16 09:20:20 +0000 |
| commit | df601fe3e27210133e3551352382be779a4408ca (patch) | |
| tree | 9cd934f71a340540c798e8c92076625f1992b3ad /src/GudhUI/gui/MainWindow.h | |
| parent | a2977f4038b8cfc375f037de7c5c805a9079f9f7 (diff) | |
| parent | e3707de64413df06f83770a40ed8ba4ad9a69951 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1938 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8af39a00b9134dbcc77883412c29d7184479979b
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" |