From d39087e74186e208a7d90d822edb16ec809a62e2 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Fri, 3 Oct 2014 10:27:20 -0400
Subject: [PATCH] fix for BOOST_JOIN parse error during moccing for boost 1.56
patch by Mark Livingstone
---
modules/gfx/src/gfx_object.hh | 3 ++-
modules/gui/src/scene_win/entity_node.hh | 3 +++
modules/gui/src/sequence_viewer/alignment_view_object.hh | 3 +++
modules/gui/src/sequence_viewer/sequence_delegate.hh | 2 ++
modules/gui/src/sequence_viewer/sequence_model.hh | 3 +++
modules/gui/src/sequence_viewer/sequence_view_object.hh | 3 ++-
modules/gui/src/sequence_viewer/sequence_viewer.hh | 2 ++
7 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/modules/gfx/src/gfx_object.hh b/modules/gfx/src/gfx_object.hh
index e0e8f5b82..03d76a8c4 100644
--- a/modules/gfx/src/gfx_object.hh
+++ b/modules/gfx/src/gfx_object.hh
@@ -26,6 +26,7 @@
#ifdef check
#undef check
#endif
+#ifndef Q_MOC_RUN
#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
@@ -41,7 +42,7 @@
#include "vertex_array.hh"
#include "input.hh"
#include "exporter_fw.hh"
-
+#endif
namespace ost { namespace gfx {
class Scene; // fw decl
diff --git a/modules/gui/src/scene_win/entity_node.hh b/modules/gui/src/scene_win/entity_node.hh
index 8b716ec11..a9e589124 100644
--- a/modules/gui/src/scene_win/entity_node.hh
+++ b/modules/gui/src/scene_win/entity_node.hh
@@ -19,6 +19,8 @@
#ifndef OST_GUI_SCENE_WIN_ENTITY_NODE_HH
#define OST_GUI_SCENE_WIN_ENTITY_NODE_HH
+#ifndef Q_MOC_RUN
+
#include <ost/gfx/gfx_node_fw.hh>
#include <ost/gfx/gfx_node.hh>
@@ -27,6 +29,7 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/gfx_scene_node.hh>
+#endif
/*
Author: Stefan Scheuber
diff --git a/modules/gui/src/sequence_viewer/alignment_view_object.hh b/modules/gui/src/sequence_viewer/alignment_view_object.hh
index 37d38e9f7..9c96d31c5 100644
--- a/modules/gui/src/sequence_viewer/alignment_view_object.hh
+++ b/modules/gui/src/sequence_viewer/alignment_view_object.hh
@@ -23,11 +23,14 @@
Author: Stefan Scheuber
*/
+#ifndef Q_MOC_RUN
+
#include <ost/seq/alignment_handle.hh>
#include <ost/gfx/gradient.hh>
#include "sequence_view_object.hh"
+#endif
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.hh b/modules/gui/src/sequence_viewer/sequence_delegate.hh
index e70dc118b..491669d47 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.hh
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.hh
@@ -23,10 +23,12 @@
Author: Stefan Scheuber
*/
+#ifndef Q_MOC_RUN
#include "sequence_model.hh"
#include <QItemDelegate>
#include <QModelIndex>
+#endif
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_model.hh b/modules/gui/src/sequence_viewer/sequence_model.hh
index aa3f0f44e..ce605c8f4 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.hh
+++ b/modules/gui/src/sequence_viewer/sequence_model.hh
@@ -23,6 +23,7 @@
Author: Stefan Scheuber
*/
+#ifndef Q_MOC_RUN
#include <ost/mol/chain_view.hh>
@@ -37,6 +38,8 @@
#include <QAbstractTableModel>
#include <QItemSelection>
+#endif
+
namespace ost { namespace gui {
class SequenceModel : public QAbstractTableModel
diff --git a/modules/gui/src/sequence_viewer/sequence_view_object.hh b/modules/gui/src/sequence_viewer/sequence_view_object.hh
index 19398db99..c3addfe40 100644
--- a/modules/gui/src/sequence_viewer/sequence_view_object.hh
+++ b/modules/gui/src/sequence_viewer/sequence_view_object.hh
@@ -23,6 +23,7 @@
Author: Stefan Scheuber
*/
+#ifndef Q_MOC_RUN
#include <ost/mol/entity_handle.hh>
@@ -38,7 +39,7 @@
#include "seq_text_painter.hh"
#include "base_view_object.hh"
-
+#endif
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.hh b/modules/gui/src/sequence_viewer/sequence_viewer.hh
index bce3c41e5..bd780a3b9 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.hh
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.hh
@@ -23,6 +23,7 @@
Author: Stefan Scheuber
*/
+#ifndef Q_MOC_RUN
#include <ost/seq/alignment_handle.hh>
@@ -39,6 +40,7 @@
#include <QToolBar>
#include <QModelIndex>
#include <QItemSelection>
+#endif
namespace ost {
--
GitLab