Refs #13872 Change clang control around gcc warning disabler

Framework/DataObjects/src/MDFramesToSpecialCoordinateSystem.cpp

@@ -12,9 +12,8 @@ MDFramesToSpecialCoordinateSystem::~MDFramesToSpecialCoordinateSystem() {}
 
 // Need to turn off the warnings because of boost optional being used.
 // clang-format off
-GCC_DIAG_OFF(cast-qual)
+GCC_DIAG_OFF(uninitialized)
 // clang-format on
-GCC_DIAG_OFF(maybe-uninitialized)
 /**
  * Get the Special Coordinate System based on the MDFrame information.
  * @param workspace: the workspace which is being queried
@@ -63,9 +62,8 @@ boost::optional<Mantid::Kernel::SpecialCoordinateSystem>
 
   return output;
 }
-GCC_DIAG_ON(maybe-uninitialized)
 // clang-format off
-GCC_DIAG_ON(cast-qual)
+GCC_DIAG_ON(uninitialized)
 // clang-format on
 
 /**

Framework/DataObjects/src/MDHistoWorkspace.cpp

@@ -1218,9 +1218,8 @@ uint64_t MDHistoWorkspace::sumNContribEvents() const {
  * Get the Q frame system (if any) to use.
 */
 // clang-format off
-GCC_DIAG_OFF(cast-qual)
-// clang-format on
 GCC_DIAG_OFF(strict-aliasing)
+// clang-format on
 Kernel::SpecialCoordinateSystem
 MDHistoWorkspace::getSpecialCoordinateSystem() const {
   MDFramesToSpecialCoordinateSystem converter;
@@ -1229,14 +1228,14 @@ MDHistoWorkspace::getSpecialCoordinateSystem() const {
   if (coordinatesFromMDFrames) {
     coordinates = coordinatesFromMDFrames.get();
   }
-
   return coordinates;
 }
-GCC_DIAG_ON(strict-aliasing)
 // clang-format off
-GCC_DIAG_ON(cast-qual)
+GCC_DIAG_ON(strict-aliasing)
 // clang-format on
 
+
+
 /**
 Set the special coordinate system (if any) to use.
 @param coordinateSystem : Special coordinate system to use.