From aeb6c4e01b68431cf2fb763c807c68b763eba5c4 Mon Sep 17 00:00:00 2001
From: Ben Webb <ben@salilab.org>
Date: Tue, 29 Mar 2022 12:37:50 -0700
Subject: [PATCH] Use C++11 features
IMP now requires C++11, so we can now use the
'override' keyword and range-based for loops.
---
include/GaussianEMRestraint.h | 9 ++++-----
include/utilities.h | 7 +++----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/include/GaussianEMRestraint.h b/include/GaussianEMRestraint.h
index 58908d6..1f42492 100755
--- a/include/GaussianEMRestraint.h
+++ b/include/GaussianEMRestraint.h
@@ -134,16 +134,15 @@ class IMPBAYESIANEMEXPORT GaussianEMRestraint : public Restraint
Float get_slope(){return slope_;}
virtual double
- unprotected_evaluate(IMP::DerivativeAccumulator *accum)
- const IMP_OVERRIDE;
- virtual IMP::ModelObjectsTemp do_get_inputs() const IMP_OVERRIDE;
+ unprotected_evaluate(IMP::DerivativeAccumulator *accum) const override;
+ virtual IMP::ModelObjectsTemp do_get_inputs() const override;
void show(std::ostream &out) const { out << "GEM restraint"; }
//! \return Information for writing to RMF files
- RestraintInfo *get_static_info() const IMP_OVERRIDE;
+ RestraintInfo *get_static_info() const override;
//! \return Information for writing to RMF files
- RestraintInfo *get_dynamic_info() const IMP_OVERRIDE;
+ RestraintInfo *get_dynamic_info() const override;
IMP_OBJECT_METHODS(GaussianEMRestraint);
diff --git a/include/utilities.h b/include/utilities.h
index 24915c6..aa0dfbe 100755
--- a/include/utilities.h
+++ b/include/utilities.h
@@ -203,7 +203,7 @@ IMP::em::DensityMap *get_masked_map(const IMP::algebra::Gaussian3Ds &gmm,
double threshold) {
DensityGrid mask = IMP::bayesianem::get_grid(densitymap);
- IMP_FOREACH(const DensityGrid::Index & i, mask.get_all_indexes()) {
+ for (const DensityGrid::Index & i : mask.get_all_indexes()) {
mask[i] = 0.0;
}
@@ -274,7 +274,7 @@ double get_overlap_fast(const IMP::algebra::Gaussian3Ds &gmm,
/*
double m1(0.0);
double m2(0.0);
- IMP_FOREACH(const IMP::algebra::DensityGrid::Index & i,
+ for (const IMP::algebra::DensityGrid::Index & i :
orig.get_all_indexes()) {
IMP::algebra::Vector3D position(orig.get_center(i));
IMP::algebra::DensityGrid::Index
@@ -286,8 +286,7 @@ double get_overlap_fast(const IMP::algebra::Gaussian3Ds &gmm,
*/
double score(0.0);
int norm(0);
- IMP_FOREACH(const DensityGrid::Index & i,
- orig.get_all_indexes()) {
+ for (const DensityGrid::Index & i : orig.get_all_indexes()) {
IMP::algebra::Vector3D position(orig.get_center(i));
DensityGrid::Index j(rasterized.get_nearest_index(position));
// rasterized[j]*=scale;
--
GitLab