From a516eca4f35e81e07ac02f7d29df5766f8be874d Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Fri, 19 Mar 2010 12:44:39 +0000
Subject: [PATCH] revert last few io_manager commits (sorry, I had a git
beginner problem..)
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1844 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/io/src/io_manager.cc | 6 ++++--
modules/io/src/io_manager.hh | 11 +++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/io/src/io_manager.cc b/modules/io/src/io_manager.cc
index 3c7123c35..b48b67953 100644
--- a/modules/io/src/io_manager.cc
+++ b/modules/io/src/io_manager.cc
@@ -17,13 +17,13 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
#include <ost/io/io_manager.hh>
-#include <ost/io/mol/entity_io_pdb_handler.hh>
+#include <ost/io/mol/entity_io_pdb_handler.hh>
#include <ost/io/mol/entity_io_crd_handler.hh>
#include <ost/io/mol/entity_io_sdf_handler.hh>
#include <ost/io/seq/fasta_io_handler.hh>
#include <ost/io/seq/promod_io_handler.hh>
#include <ost/io/mol/surface_io_msms_handler.hh>
-#include <ost/io/seq/clustal_io_handler.hh>
+#include <ost/io/seq/clustal_io_handler.hh>
#if OST_IMG_ENABLED
# include <ost/io/img/map_io_dx_handler.hh>
# include <ost/io/img/map_io_spi_handler.hh>
@@ -251,6 +251,8 @@ const MapIOFList& IOManager::GetAvailableMapHandler() const
return map_io_list_;
}
+#endif //OST_IMG_ENABLED
+
void IOManager::RegisterFactory(const EntityIOHandlerFactoryBaseP& f)
{
entity_iohf_list_.push_back(f);
diff --git a/modules/io/src/io_manager.hh b/modules/io/src/io_manager.hh
index f23c60ec7..a320f01ce 100644
--- a/modules/io/src/io_manager.hh
+++ b/modules/io/src/io_manager.hh
@@ -36,16 +36,16 @@
#include <ost/io/io_exception.hh>
namespace ost { namespace io {
-/// \brief Central registry for input/output handlers
-class DLLEXPORT_OST_IO IOManager {
- typedef std::vector<EntityIOHandlerFactoryBaseP> EntityIOHFList;
- typedef std::vector<SequenceIOHandlerFactoryBasePtr> AlignmentIOFList;
- typedef std::vector<SurfaceIOHandlerFactoryBasePtr> SurfaceIOFList;
+typedef std::vector<EntityIOHandlerFactoryBaseP> EntityIOHFList;
+typedef std::vector<SequenceIOHandlerFactoryBasePtr> AlignmentIOFList;
+typedef std::vector<SurfaceIOHandlerFactoryBasePtr> SurfaceIOFList;
#if OST_IMG_ENABLED
typedef std::vector<MapIOHandlerFactoryBasePtr> MapIOFList;
#endif
+/// \brief Central registry for input/output handlers
+class DLLEXPORT_OST_IO IOManager {
public:
/// \brief get entity io handler that is able to import the given file.
///
@@ -125,7 +125,6 @@ public:
const ImageFormatBase& format);
const MapIOFList& GetAvailableMapHandler() const;
-
//@}
#endif
--
GitLab