diff --git a/modules/mol/alg/src/ldt.cc b/modules/mol/alg/src/ldt.cc index ace3fca68a1b48d555c5a31ece8c004bfbb4205f..822b4389805b9d27a4b204eeb3222d95f78e0a9c 100644 --- a/modules/mol/alg/src/ldt.cc +++ b/modules/mol/alg/src/ldt.cc @@ -234,7 +234,7 @@ int main (int argc, char **argv) EntityView model2=model.Select("aname!=CEN,NV,OT1,OT,CAY,CY,OXT,1OCT,NT,OT2,2OCT,OVL1,OC1,O1,OC2,O2,OVU1"); EntityView v1=model2.Select("not (rname==GLY and aname==CB)"); boost::filesystem::path pathstring(files[i]); - String filestring=pathstring.filename(); + String filestring=pathstring.filename().string(); if (filestring.substr(5,5)=="TS257" || filestring.substr(5,5)=="TS458" ) { for (AtomHandleIter ait=v1.GetHandle().AtomsBegin();ait!=v1.GetHandle().AtomsEnd();++ait){ AtomHandle aitv = *ait; diff --git a/modules/mol/alg/src/local_dist_test.cc b/modules/mol/alg/src/local_dist_test.cc index ecf9a61eb6e0e6da77d4c4f8624b35ccdb881566..83d842226ac03a401796a111dcdf3334365f8a61 100644 --- a/modules/mol/alg/src/local_dist_test.cc +++ b/modules/mol/alg/src/local_dist_test.cc @@ -59,9 +59,9 @@ std::pair<bool,Real> within_tolerance(Real mdl_dist, const ReferenceDistance& re Real difference = 0; if (mdl_dist>=min && mdl_dist <=max) { within_tol=true; - } else if (mdl_dist < min && abs(min-mdl_dist) < tol) { + } else if (mdl_dist < min && std::abs(min-mdl_dist) < tol) { within_tol = true; - } else if (mdl_dist > max && abs(mdl_dist-max) < tol) { + } else if (mdl_dist > max && std::abs(mdl_dist-max) < tol) { within_tol = true; } if (within_tol == false) {