Merge branch 'clang-macos14-fixes' into 'master'

fixes for warnings/errors with Xcode 10.2

See merge request !61

src/Algorithms/OrbitThreader.cpp

@@ -367,4 +367,4 @@ void OrbitThreader::setDesignEnergy(FieldList &allElements, const std::set<std::
             element->setDesignEnergy(kineticEnergyeV);
         }
     }
-}
\ No newline at end of file
+}

src/Algorithms/OrbitThreader.h

@@ -62,7 +62,7 @@ private:
     };
 
     struct elementPositionComp {
-        bool operator() (const elementPosition &a, const elementPosition &b) {
+        bool operator() (const elementPosition &a, const elementPosition &b) const {
             return a.elementEdge_m < b.elementEdge_m;
         }
     };
@@ -97,4 +97,4 @@ IndexMap::value_t OrbitThreader::getTouchingElements(const std::pair<double, dou
     return imap_m.getTouchingElements(range);
 }
 
-#endif
\ No newline at end of file
+#endif

src/Classic/AbsBeamline/Bend.cpp

@@ -1501,7 +1501,7 @@ std::pair<Vector_t, Vector_t> Bend::getDesignPathSecant(double startsAtDistFromE
     double stepSize = euclidean_norm(step);
     tangent = step / stepSize;
     startPosition = refTrajMap_m[i] + diff * tangent;
-    tangent = tangent;
+    //tangent = tangent;
 
     return std::make_pair(startPosition, tangent);
 }

src/Classic/Utilities/MSLang.h

@@ -65,7 +65,7 @@ namespace mslang {
         virtual void divideBy(std::vector<std::shared_ptr<Base> > &divisors) {
             for (auto item: divisors) {
                 if (bb_m.doesIntersect(item->bb_m)) {
-                    divisor_m.emplace_back(std::move(item->clone()));
+                    divisor_m.emplace_back(item->clone());
                 }
             }
         }
@@ -74,4 +74,4 @@ namespace mslang {
     bool parse(std::string str, Function* &fun);
 }
 
-#endif
\ No newline at end of file
+#endif

src/Classic/Utilities/MSLang/Difference.cpp

@@ -20,7 +20,7 @@ namespace mslang {
         divisor_m->apply(denom);
         for (auto item: nom) {
             item->divideBy(denom);
-            bfuncs.emplace_back(std::move(item->clone()));
+            bfuncs.emplace_back(item->clone());
         }
 
         for (auto item: nom)
@@ -54,4 +54,4 @@ namespace mslang {
 
         return true;
     }
-}
\ No newline at end of file
+}

src/Classic/Utilities/MSLang/Ellipse.cpp

@@ -51,7 +51,7 @@ namespace mslang {
     }
 
     void Ellipse::apply(std::vector<std::shared_ptr<Base> > &bfuncs) {
-        bfuncs.emplace_back(std::move(this->clone()));
+        bfuncs.emplace_back(this->clone());
     }
 
     std::shared_ptr<Base> Ellipse::clone() const{
@@ -62,7 +62,7 @@ namespace mslang {
         elps->bb_m = bb_m;
 
         for (auto item: divisor_m) {
-            elps->divisor_m.emplace_back(std::move(item->clone()));
+            elps->divisor_m.emplace_back(item->clone());
         }
 
         return std::static_pointer_cast<Base>(elps);
@@ -149,4 +149,4 @@ namespace mslang {
 
         return true;
     }
-}
\ No newline at end of file
+}

src/Classic/Utilities/MSLang/Intersection.cpp

@@ -26,7 +26,7 @@ namespace mslang {
 
         for (auto item: first) {
             item->divideBy(firstrep);
-            bfuncs.emplace_back(std::move(item->clone()));
+            bfuncs.emplace_back(item->clone());
         }
 
         for (auto item: first)
@@ -62,4 +62,4 @@ namespace mslang {
 
         return true;
     }
-}
\ No newline at end of file
+}

src/Classic/Utilities/MSLang/Rectangle.cpp

@@ -87,7 +87,7 @@ namespace mslang {
     }
 
     void Rectangle::apply(std::vector<std::shared_ptr<Base> > &bfuncs) {
-        bfuncs.emplace_back(std::move(this->clone()));
+        bfuncs.emplace_back(this->clone());
     }
 
     std::shared_ptr<Base> Rectangle::clone() const {
@@ -98,7 +98,7 @@ namespace mslang {
         rect->bb_m = bb_m;
 
         for (auto item: divisor_m) {
-            rect->divisor_m.emplace_back(std::move(item->clone()));
+            rect->divisor_m.emplace_back(item->clone());
         }
 
         return std::static_pointer_cast<Base>(rect);
@@ -136,4 +136,4 @@ namespace mslang {
 
         return true;
     }
-}
\ No newline at end of file
+}

src/Classic/Utilities/MSLang/SymmetricDifference.cpp

@@ -20,7 +20,7 @@ namespace mslang {
         secondOperand_m->apply(second);
         for (auto item: first) {
             item->divideBy(second);
-            bfuncs.emplace_back(std::move(item->clone()));
+            bfuncs.emplace_back(item->clone());
         }
 
         for (auto item: first)
@@ -31,7 +31,7 @@ namespace mslang {
         firstOperand_m->apply(first);
         for (auto item: second) {
             item->divideBy(first);
-            bfuncs.emplace_back(std::move(item->clone()));
+            bfuncs.emplace_back(item->clone());
         }
 
         for (auto item: first)
@@ -65,4 +65,4 @@ namespace mslang {
 
         return true;
     }
-}
\ No newline at end of file
+}

src/Classic/Utilities/MSLang/Triangle.cpp

@@ -20,7 +20,7 @@ namespace mslang {
                   << indent << indentbase << trafo_m(2, 0) << "\t" << trafo_m(2, 1) << "\t" << trafo_m(2, 2) << std::endl;
     }
     void Triangle::apply(std::vector<std::shared_ptr<Base> > &bfuncs) {
-        bfuncs.emplace_back(std::move(this->clone()));
+        bfuncs.emplace_back(this->clone());
     }
 
     std::shared_ptr<Base>  Triangle::clone() const {
@@ -29,7 +29,7 @@ namespace mslang {
         tri->bb_m = bb_m;
 
         for (auto item: divisor_m) {
-            tri->divisor_m.emplace_back(std::move(item->clone()));
+            tri->divisor_m.emplace_back(item->clone());
         }
 
         return std::static_pointer_cast<Base>(tri);
@@ -106,4 +106,4 @@ namespace mslang {
             std::swap(nodes_m[1], nodes_m[2]);
         }
     }
-}
\ No newline at end of file
+}

src/Sample/OpalSample.h

@@ -19,6 +19,8 @@ public:
     /// Exemplar constructor.
     OpalSample();
 
+    virtual ~OpalSample() {};
+
     /// Make clone.
     virtual OpalSample *clone(const std::string &name);
 
@@ -56,4 +58,4 @@ inline
 unsigned int OpalSample::getSize() const{
     return size_m;
 }
-#endif
\ No newline at end of file
+#endif

src/Sample/SamplingMethod.h

@@ -13,6 +13,7 @@ class SamplingMethod
 {
 
 public:
+        virtual ~SamplingMethod() {};
     virtual void create(boost::shared_ptr<SampleIndividual>& ind, size_t i) = 0;
     
     /*!
@@ -33,4 +34,4 @@ public:
     }
 };
 
-#endif
\ No newline at end of file
+#endif

src/Steppers/Stepper.h

@@ -47,6 +47,7 @@ public:
         }
         return isBad;
     };
+    virtual ~Stepper() {};
 
 protected:
     const FieldFunction& fieldfunc_m;