Merge pull request #37838 from mantidproject/cpp_20

Update to C++ 20 standard

Author: peterfpeterson

Framework/API/inc/MantidAPI/NumericAxis.h

@@ -41,6 +41,7 @@ class MANTID_API_DLL NumericAxis : public Axis {
   /// Set the value at a specific index
   void setValue(const std::size_t &index, const double &value) override;
   size_t indexOfValue(const double value) const override;
+  bool operator==(const NumericAxis &) const;
   bool operator==(const Axis &) const override;
   virtual bool equalWithinTolerance(const Axis &axis2, const double tolerance) const;
   std::string label(const std::size_t &index) const override;

Framework/API/inc/MantidAPI/TextAxis.h

@@ -47,6 +47,7 @@ class MANTID_API_DLL TextAxis : public Axis {
   void setValue(const std::size_t &index, const double &value) override;
   size_t indexOfValue(const double value) const override;
 
+  bool operator==(const TextAxis &) const;
   bool operator==(const Axis &) const override;
   /// Get the label at the specified index
   std::string label(const std::size_t &index) const override;
@@ -60,6 +61,7 @@ class MANTID_API_DLL TextAxis : public Axis {
 private:
   /// A vector holding the axis values for the axis.
   std::vector<std::string> m_values;
+  bool compareToTextAxis(const TextAxis &axis2) const;
 };
 
 } // namespace API

Framework/API/src/CompositeFunction.cpp

@@ -27,7 +27,7 @@ namespace Mantid::API {
 namespace {
 /// static logger
 Kernel::Logger g_log("CompositeFunction");
-constexpr char *ATTNUMDERIV = "NumDeriv";
+constexpr const char *ATTNUMDERIV = "NumDeriv";
 constexpr int NUMDEFAULTATTRIBUTES = 1;
 /**
  * Helper function called when we replace a function within the composite

Framework/API/src/NotebookBuilder.cpp

@@ -12,6 +12,7 @@
 #include "MantidAPI/HistoryItem.h"
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/Property.h"
+#include "MantidKernel/WarningSuppressions.h"
 
 #include <boost/utility.hpp>
 #include <utility>
@@ -143,6 +144,8 @@ const std::string NotebookBuilder::buildAlgorithmString(const AlgorithmHistory_c
   return name + "(" + propStr + ")";
 }
 
+GNU_DIAG_OFF("maybe-uninitialized")
+
 /**
  * Build the script output for a single property
  *
@@ -182,4 +185,6 @@ const std::string NotebookBuilder::buildPropertyString(const PropertyHistory_con
   return prop;
 }
 
+GNU_DIAG_ON("maybe-uninitialized")
+
 } // namespace Mantid::API

Framework/API/src/NumericAxis.cpp

@@ -107,6 +107,12 @@ void NumericAxis::setValue(const std::size_t &index, const double &value) {
   m_values[index] = value;
 }
 
+/** Check if two NumericAxis are equivalent
+ *  @param axis2 :: Reference to the axis to compare to
+ *  @return true if self and second axis are equal
+ */
+bool NumericAxis::operator==(const NumericAxis &axis2) const { return equalWithinTolerance(axis2, 1e-15); }
+
 /** Check if two axis defined as spectra or numeric axis are equivalent
  *  @param axis2 :: Reference to the axis to compare to
  *  @return true if self and second axis are equal

Framework/API/src/ScriptBuilder.cpp

@@ -17,6 +17,7 @@
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/Property.h"
 #include "MantidKernel/PropertyHistory.h"
+#include "MantidKernel/WarningSuppressions.h"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/range/algorithm/remove_if.hpp>
@@ -260,6 +261,8 @@ const std::string ScriptBuilder::buildAlgorithmString(const AlgorithmHistory &al
   return historyEntry;
 }
 
+GNU_DIAG_OFF("maybe-uninitialized")
+
 /**
  * Build the script output for a single property
  *
@@ -316,4 +319,6 @@ const std::string ScriptBuilder::buildPropertyString(const Mantid::Kernel::Prope
   return prop;
 }
 
+GNU_DIAG_ON("maybe-uninitialized")
+
 } // namespace Mantid::API

Framework/API/src/TextAxis.cpp

@@ -74,19 +74,29 @@ size_t TextAxis::indexOfValue(const double value) const {
   return Mantid::Kernel::VectorHelper::indexOfValueFromCenters(spectraNumbers, value);
 }
 
-/** Check if two axis defined as spectra or numeric axis are equivalent
+/** Check if two TextAxis are equivalent
  *  @param axis2 :: Reference to the axis to compare to
  *  @return true if self and other axis are equal
  */
-bool TextAxis::operator==(const Axis &axis2) const {
+bool TextAxis::operator==(const TextAxis &axis2) const { return compareToTextAxis(axis2); }
+
+bool TextAxis::compareToTextAxis(const TextAxis &axis2) const {
   if (length() != axis2.length()) {
     return false;
   }
+  return std::equal(m_values.begin(), m_values.end(), axis2.m_values.begin());
+}
+
+/** Check if two axis defined as spectra or numeric axis are equivalent
+ *  @param axis2 :: Reference to the axis to compare to
+ *  @return true if self and other axis are equal
+ */
+bool TextAxis::operator==(const Axis &axis2) const {
   const auto *spec2 = dynamic_cast<const TextAxis *>(&axis2);
   if (!spec2) {
     return false;
   }
-  return std::equal(m_values.begin(), m_values.end(), spec2->m_values.begin());
+  return compareToTextAxis(*spec2);
 }
 
 /** Returns a text label which shows the value at index and identifies the

Framework/API/test/MDFrameValidatorTest.h

@@ -30,15 +30,15 @@ class MDFrameValidatorTest : public CxxTest::TestSuite {
   static void destroySuite(MDFrameValidatorTest *suite) { delete suite; }
 
   void testGetType() {
-    MDFrameValidator unitValidator(HKL::HKLName);
+    MDFrameValidator unitValidator(Mantid::Geometry::HKL::HKLName);
     TS_ASSERT_EQUALS(unitValidator.getType(), "mdframe");
   }
 
   void testHKLMDWorkspaceIsValidForValidatorWithHKLFrame() {
-    MDFrameValidator frameValidator(HKL::HKLName);
+    MDFrameValidator frameValidator(Mantid::Geometry::HKL::HKLName);
 
     HKLFrameFactory factory;
-    auto frame = factory.create(MDFrameArgument{HKL::HKLName, Units::Symbol::RLU});
+    auto frame = factory.create(MDFrameArgument{Mantid::Geometry::HKL::HKLName, Units::Symbol::RLU});
     auto dim = std::make_shared<MDHistoDimension>("x", "x", *frame, 0.0f, 100.0f, 10);
     auto ws = std::make_shared<MDHistoWorkspaceTester>(dim, dim, dim);
     TS_ASSERT_EQUALS(frameValidator.isValid(ws), "")
@@ -47,7 +47,7 @@ class MDFrameValidatorTest : public CxxTest::TestSuite {
   void testHKLMDWorkspaceIsNotValidForValidatorWithQLabFrame() {
     MDFrameValidator frameValidator(QLab::QLabName);
 
-    MDFrameArgument args{HKL::HKLName, Units::Symbol::RLU};
+    MDFrameArgument args{Mantid::Geometry::HKL::HKLName, Units::Symbol::RLU};
     auto frame = HKLFrameFactory().create(args);
     auto dim = std::make_shared<MDHistoDimension>("x", "x", *frame, 0.0f, 100.0f, 10);
     auto ws = std::make_shared<MDHistoWorkspaceTester>(dim, dim, dim);
@@ -57,7 +57,7 @@ class MDFrameValidatorTest : public CxxTest::TestSuite {
   void testMixedAxisMDWorkspaceIsNotValidForValidatorWithQLabFrame() {
     MDFrameValidator frameValidator(QLab::QLabName);
 
-    MDFrameArgument axisArgs1{HKL::HKLName, Units::Symbol::RLU};
+    MDFrameArgument axisArgs1{Mantid::Geometry::HKL::HKLName, Units::Symbol::RLU};
     MDFrameArgument axisArgs2{QLab::QLabName, Units::Symbol::InverseAngstrom};
 
     auto frame1 = HKLFrameFactory().create(axisArgs1);

Framework/Algorithms/src/SampleCorrections/MayersSampleCorrection.cpp

@@ -166,11 +166,11 @@ Kernel::IValidator_sptr MayersSampleCorrection::createInputWSValidator() const {
   using Kernel::CompositeValidator;
   auto validator = std::make_shared<CompositeValidator>();
 
-  unsigned int requires = (InstrumentValidator::SamplePosition | InstrumentValidator::SourcePosition);
-  validator->add<InstrumentValidator, unsigned int>(requires);
+  unsigned int require = (InstrumentValidator::SamplePosition | InstrumentValidator::SourcePosition);
+  validator->add<InstrumentValidator, unsigned int>(require);
 
-  requires = (SampleValidator::Shape | SampleValidator::Material);
-  validator->add<SampleValidator, unsigned int>(requires);
+  require = (SampleValidator::Shape | SampleValidator::Material);
+  validator->add<SampleValidator, unsigned int>(require);
 
   // NOTE: Mayers correction requires the input to be of TOF
   validator->add<WorkspaceUnitValidator>("TOF");

Framework/Crystal/test/FindClusterFacesTest.h

@@ -110,7 +110,8 @@ class FindClusterFacesTest : public CxxTest::TestSuite {
 
 private:
   void verify_table_row(ITableWorkspace_sptr &outWS, int expectedClusterId, double expectedWorkspaceIndex,
-                        int expectedNormalDimensionIndex, bool expectedMaxExtent, double expectedRadius = -1) {
+                        int expectedNormalDimensionIndex, Mantid::API::Boolean expectedMaxExtent,
+                        double expectedRadius = -1) {
     for (size_t rowIndex = 0; rowIndex < outWS->rowCount(); ++rowIndex) {
       auto clusterId = outWS->cell<int>(rowIndex, 0);
       auto wsIndex = outWS->cell<double>(rowIndex, 1);