From a2c166d332d869ee5bf802140117c1a45263310c Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 8 Sep 2010 11:57:30 +0000
Subject: [PATCH] More include inversions
Needed to deal with a probably buggy libstdc++ shipped by Apple with the latest Xcode. Shame on you, Apple!
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2698 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/pymod/export_message_widget.cc | 2 +-
modules/gui/pymod/export_remote_site_loader.cc | 8 ++++----
modules/gui/pymod/export_sequence_viewer.cc | 2 +-
modules/gui/pymod/export_tool.cc | 3 +--
modules/gui/pymod/export_widget.cc | 4 ++--
modules/gui/src/plot_viewer/plot_data_info.hh | 5 ++---
modules/gui/src/plot_viewer/plot_group_info.hh | 4 ++--
7 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/modules/gui/pymod/export_message_widget.cc b/modules/gui/pymod/export_message_widget.cc
index 0cbdcdfc7..0a9c2d7dc 100644
--- a/modules/gui/pymod/export_message_widget.cc
+++ b/modules/gui/pymod/export_message_widget.cc
@@ -16,9 +16,9 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <vector>
#include <boost/python.hpp>
+#include <vector>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <ost/gui/messages/message_widget.hh>
diff --git a/modules/gui/pymod/export_remote_site_loader.cc b/modules/gui/pymod/export_remote_site_loader.cc
index 91b80ca77..d864b87e4 100644
--- a/modules/gui/pymod/export_remote_site_loader.cc
+++ b/modules/gui/pymod/export_remote_site_loader.cc
@@ -16,20 +16,20 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <string>
#include <boost/python.hpp>
-#include <boost/python/register_ptr_to_python.hpp>
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#include <string>
-using namespace boost::python;
#include <ost/gui/remote_site_loader.hh>
+#include <boost/python/register_ptr_to_python.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include "sip_handler.hh"
using namespace ost;
using namespace ost::gui;
+using namespace boost::python;
struct WrappedRemoteSiteLoader : public RemoteSiteLoader
{
diff --git a/modules/gui/pymod/export_sequence_viewer.cc b/modules/gui/pymod/export_sequence_viewer.cc
index fb2c7e45f..268b4dd2b 100644
--- a/modules/gui/pymod/export_sequence_viewer.cc
+++ b/modules/gui/pymod/export_sequence_viewer.cc
@@ -16,9 +16,9 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <vector>
#include <boost/python.hpp>
+#include <vector>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <ost/gui/sequence_viewer/sequence_viewer.hh>
diff --git a/modules/gui/pymod/export_tool.cc b/modules/gui/pymod/export_tool.cc
index 946340659..1d050038f 100644
--- a/modules/gui/pymod/export_tool.cc
+++ b/modules/gui/pymod/export_tool.cc
@@ -17,9 +17,8 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <vector>
-
#include <boost/python.hpp>
+#include <vector>
#include <boost/python/register_ptr_to_python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/modules/gui/pymod/export_widget.cc b/modules/gui/pymod/export_widget.cc
index 20d4cc746..f548e52ff 100644
--- a/modules/gui/pymod/export_widget.cc
+++ b/modules/gui/pymod/export_widget.cc
@@ -16,17 +16,17 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <string>
#include <boost/python.hpp>
+#include <string>
#include <boost/python/register_ptr_to_python.hpp>
-using namespace boost::python;
#include <ost/gui/widget.hh>
#include "sip_handler.hh"
+using namespace boost::python;
using namespace ost;
using namespace ost::gui;
diff --git a/modules/gui/src/plot_viewer/plot_data_info.hh b/modules/gui/src/plot_viewer/plot_data_info.hh
index d1f6a44a6..d1babc2f9 100644
--- a/modules/gui/src/plot_viewer/plot_data_info.hh
+++ b/modules/gui/src/plot_viewer/plot_data_info.hh
@@ -24,11 +24,10 @@
Author: Andreas Schenk
*/
-#include <vector>
-#include <boost/python.hpp>
-
#include <ost/gui/module_config.hh>
#include <ost/gui/plot_viewer/plot_data_info_fw.hh>
+#include <boost/python.hpp>
+#include <vector>
#include "plot_info_base.hh"
diff --git a/modules/gui/src/plot_viewer/plot_group_info.hh b/modules/gui/src/plot_viewer/plot_group_info.hh
index 20f6b4c74..e7668633a 100644
--- a/modules/gui/src/plot_viewer/plot_group_info.hh
+++ b/modules/gui/src/plot_viewer/plot_group_info.hh
@@ -19,10 +19,10 @@
#ifndef PLOT_GROUP_INFO_HH_
#define PLOT_GROUP_INFO_HH_
+#include "plot_info_base.hh"
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <boost/python.hpp>
-#include "plot_info_base.hh"
+#include <boost/shared_ptr.hpp>
namespace ost{namespace gui{
--
GitLab