Skip to content

Commit

Permalink
C++11 syntax fixes for Crystal. refs #6592
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartcampbell committed Feb 19, 2013
1 parent de03cea commit 4ea0917
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace Crystal

declareProperty("CombineMatchingPeaks", false,
"Whether to combine peaks that are identical across the two workspaces");
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
mustBePositive->setLower(0.0);
// N.B. Andrei reckons it should be delta_q/q
declareProperty("Tolerance", EMPTY_DBL(), mustBePositive,
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Crystal/src/DiffPeaksWorkspaces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace Crystal
declareProperty(new WorkspaceProperty<PeaksWorkspace>("OutputWorkspace","",Direction::Output),
"The set of peaks that are in the first, but not the second, workspace.");

auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
mustBePositive->setLower(0.0);
// N.B. Andrei reckons it should be delta_q/q
declareProperty("Tolerance", 0.0, mustBePositive,
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Crystal/src/FilterPeaks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace Crystal
filters.push_back("Signal/Noise");
declareProperty("FilterVariable","",boost::make_shared<StringListValidator>(filters),"The variable on which to filter the peaks");

declareProperty("FilterValue", EMPTY_DBL(), boost::make_shared<MandatoryValidator<double>>(),
declareProperty("FilterValue", EMPTY_DBL(), boost::make_shared<MandatoryValidator<double> >(),
"The value of the FilterVariable to compare each peak to");

std::vector<std::string> operation;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ namespace Mantid
<< instrument->getValidFromDate().toISO8601String() << "\">" << std::endl;
ParameterMap_sptr pmap = instrument->getParameterMap();

for (std::vector<vector<string>>::const_iterator it = Groups.begin(); it != Groups.end(); ++it)
for (std::vector<vector<string> >::const_iterator it = Groups.begin(); it != Groups.end(); ++it)
for( std::vector<string>::const_iterator it1=(*it).begin(); it1 !=(*it).end(); ++it1)
{
string bankName = (*it1);
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Crystal/src/TransformHKL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace Crystal
new WorkspaceProperty<PeaksWorkspace>("PeaksWorkspace","",Direction::InOut),
"Input Peaks Workspace");

boost::shared_ptr<BoundedValidator<double>> mustBePositive(new BoundedValidator<double>());
boost::shared_ptr<BoundedValidator<double> > mustBePositive(new BoundedValidator<double>());
mustBePositive->setLower(0.0);

this->declareProperty(
Expand Down

0 comments on commit 4ea0917

Please sign in to comment.