From 698fdaeb8c4f715d1db1e29b7de88833eec8be90 Mon Sep 17 00:00:00 2001
From: juergen <juergen@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 21 Apr 2010 15:19:21 +0000
Subject: [PATCH] fixes for windows in mae format and overlay export
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2095 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/pymod/export_overlay.cc | 8 ++++----
modules/io/src/mol/entity_io_mae_handler.cc | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/gui/pymod/export_overlay.cc b/modules/gui/pymod/export_overlay.cc
index 21019aa74..d5293ddd0 100644
--- a/modules/gui/pymod/export_overlay.cc
+++ b/modules/gui/pymod/export_overlay.cc
@@ -84,8 +84,8 @@ void export_overlay()
.def("SetName",&Overlay::SetName)
;
- class_<NullOverlay,bases<Overlay>,boost::noncopyable>("NullOverlay",init<>())
- ;
+ class_<NullOverlay,bases<Overlay>,boost::noncopyable>("NullOverlay",init<>())
+ ;
class_<PointlistOverlayBase,bases<Overlay>,boost::noncopyable>("PointlistOverlayBase",init<const String&>())
.def("SetSymbolSize",&PointlistOverlayBase::SetSymbolSize)
@@ -108,8 +108,8 @@ void export_overlay()
.def("Clear",&PointlistOverlay::Clear)
;
- class_<DrawOverlay,bases<Overlay>,boost::noncopyable>("DrawOverlay",init<ImageHandle>())
- ;
+ class_<DrawOverlay,bases<Overlay>,boost::noncopyable>("DrawOverlay",init<ImageHandle>())
+ ;
class_<MaskOverlay,bases<Overlay>,boost::noncopyable>("MaskOverlay",init<>())
.def(init<const MaskPtr&>())
diff --git a/modules/io/src/mol/entity_io_mae_handler.cc b/modules/io/src/mol/entity_io_mae_handler.cc
index 59f5dbab1..b8647c00a 100644
--- a/modules/io/src/mol/entity_io_mae_handler.cc
+++ b/modules/io/src/mol/entity_io_mae_handler.cc
@@ -62,7 +62,7 @@ using boost::format;
nrvo.push_back(line.substr(p0,p1-p0));
++p1;
p0=p1;
- while(isspace(line[p1]) and p1<line.size()) {++p0;++p1;}
+ while(isspace(line[p1]) && p1<line.size()) {++p0;++p1;}
--p0; --p1;
}
} else {
@@ -70,7 +70,7 @@ using boost::format;
nrvo.push_back(line.substr(p0+1,p1-p0-1));
++p1;
p0=p1;
- while(isspace(line[p1]) and p1<line.size()) {++p0;++p1;}
+ while(isspace(line[p1]) && p1<line.size()) {++p0;++p1;}
--p0; --p1;
} else if(line[p1]=='"') {
in_string=true;
--
GitLab