From 4fc3631d546a40d0c49898cb1b12538126fa11a8 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Fri, 23 Dec 2016 07:43:30 +0000
Subject: [PATCH] Avoid warning with brace initializers on clang
Refs #17194
---
Framework/DataHandling/src/SetSample.cpp | 6 +++---
Framework/DataHandling/test/SetSampleTest.h | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Framework/DataHandling/src/SetSample.cpp b/Framework/DataHandling/src/SetSample.cpp
index 21d7c9e567a..0b85c507178 100644
--- a/Framework/DataHandling/src/SetSample.cpp
+++ b/Framework/DataHandling/src/SetSample.cpp
@@ -191,9 +191,9 @@ std::map<std::string, std::string> SetSample::validateInputs() {
if (geomArgs) {
if (existsAndNotEmptyString(*geomArgs, GeometryArgs::SHAPE)) {
const std::array<const std::string *, 6> positiveValues = {
- &ShapeArgs::HEIGHT, &ShapeArgs::WIDTH,
- &ShapeArgs::THICK, &ShapeArgs::RADIUS,
- &ShapeArgs::INNER_RADIUS, &ShapeArgs::OUTER_RADIUS};
+ {&ShapeArgs::HEIGHT, &ShapeArgs::WIDTH, &ShapeArgs::THICK,
+ &ShapeArgs::RADIUS, &ShapeArgs::INNER_RADIUS,
+ &ShapeArgs::OUTER_RADIUS}};
for (const auto &arg : positiveValues) {
if (existsAndNegative(*geomArgs, *arg)) {
errors[PropertyNames::GEOMETRY] = *arg + " argument < 0.0";
diff --git a/Framework/DataHandling/test/SetSampleTest.h b/Framework/DataHandling/test/SetSampleTest.h
index 66ae184360a..d15ae0e3389 100644
--- a/Framework/DataHandling/test/SetSampleTest.h
+++ b/Framework/DataHandling/test/SetSampleTest.h
@@ -347,7 +347,8 @@ public:
auto args = boost::make_shared<PropertyManager>();
args->declareProperty(
Mantid::Kernel::make_unique<StringProperty>("Shape", "FlatPlate"), "");
- std::array<const std::string, 3> dimensions = {"Width", "Height", "Thick"};
+ std::array<const std::string, 3> dimensions = {
+ {"Width", "Height", "Thick"}};
const std::string geometryProp("Geometry");
for (const auto &dim : dimensions) {
args->declareProperty(
@@ -367,7 +368,7 @@ public:
auto args = boost::make_shared<PropertyManager>();
args->declareProperty(
Mantid::Kernel::make_unique<StringProperty>("Shape", "Cylinder"), "");
- std::array<const std::string, 2> dimensions = {"Radius", "Height"};
+ std::array<const std::string, 2> dimensions = {{"Radius", "Height"}};
const std::string geometryProp("Geometry");
for (const auto &dim : dimensions) {
args->declareProperty(
@@ -388,8 +389,8 @@ public:
auto args = boost::make_shared<PropertyManager>();
args->declareProperty(
Mantid::Kernel::make_unique<StringProperty>("Shape", "FlatPlate"), "");
- std::array<const std::string, 3> dimensions = {"InnerRadius", "OuterRadius",
- "Height"};
+ std::array<const std::string, 3> dimensions = {
+ {"InnerRadius", "OuterRadius", "Height"}};
const std::string geometryProp("Geometry");
for (const auto &dim : dimensions) {
args->declareProperty(
--
GitLab