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

@@ -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&>())

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;