Skip to content

Commit

Permalink
C++11 syntax fixes for MDEvents. refs #6592
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartcampbell committed Feb 19, 2013
1 parent a84f032 commit 3de44e8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/MDEvents/src/FitMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ namespace Mantid
auto outputWS = MDEventFactory::CreateMDWorkspace(inputWS->getNumDims(), "MDEvent");
// Add events
// TODO: Generalize to ND (the current framework is a bit limiting)
auto mdWS = boost::dynamic_pointer_cast<MDEvents::MDEventWorkspace<MDEvents::MDEvent<4>,4>>(outputWS);
auto mdWS = boost::dynamic_pointer_cast<MDEvents::MDEventWorkspace<MDEvents::MDEvent<4>,4> >(outputWS);
if(!mdWS)
{
return;
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/MDEvents/src/QueryMDWorkspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ namespace MDEvents

declareProperty("LimitRows", true, "Limit the report output to a maximum number of rows");

declareProperty(new PropertyWithValue<int>("MaximumRows", 100000, boost::make_shared<BoundedValidator<int>>(), Direction::Input), "The number of neighbours to utilise. Defaults to 100000.");
declareProperty(new PropertyWithValue<int>("MaximumRows", 100000, boost::make_shared<BoundedValidator<int> >(), Direction::Input), "The number of neighbours to utilise. Defaults to 100000.");
setPropertySettings("MaximumRows", new EnabledWhenProperty("LimitRows", IS_DEFAULT));

std::vector<std::string> propOptions;
Expand Down Expand Up @@ -167,7 +167,7 @@ namespace MDEvents
std::vector<double> TotalWeight(depth, 0);
std::vector<double> TotalSignal(depth, 0);
std::vector<double> TotalErrorSquared(depth, 0);
std::vector<std::vector<double>> Dims(depth, std::vector<double>(nd,0.0) );
std::vector<std::vector<double> > Dims(depth, std::vector<double>(nd,0.0) );

std::vector<MDBoxBase<MDE,nd> *> boxes;
ws->getBox()->getBoxes(boxes, depth, true);
Expand Down

0 comments on commit 3de44e8

Please sign in to comment.