Skip to content

Commit

Permalink
C++11 syntax fixes for API. refs #6592
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartcampbell committed Feb 19, 2013
1 parent 9729eb4 commit de03cea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/API/inc/MantidAPI/ExperimentInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ namespace API
/// Description of the source object
boost::shared_ptr<ModeratorModel> m_moderatorModel;
/// Description of the choppers for this experiment.
std::list<boost::shared_ptr<ChopperModel>> m_choppers;
std::list<boost::shared_ptr<ChopperModel> > m_choppers;
/// The information on the sample environment
Kernel::cow_ptr<Sample> m_sample;
/// The run information
Expand Down
10 changes: 5 additions & 5 deletions Code/Mantid/Framework/API/src/MultipleFileProperty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ namespace API
// Store.
try
{
std::vector<std::vector<std::string>> result;
std::vector<std::vector<std::string> > result;
toValue(slaveFileProp(), result, "", "");
PropertyWithValue<std::vector<std::vector<std::string> > >::operator=(result);
return "";
Expand Down Expand Up @@ -244,7 +244,7 @@ namespace API
commaTokenString.begin(), commaTokenString.end(),
boost::regex(PLUS_OPERATORS, boost::regex_constants::perl), -1);

std::vector<std::vector<std::string>> temp;
std::vector<std::vector<std::string> > temp;

// Put the tokens into a vector before iterating over it this time,
// so we can see how many we have.
Expand All @@ -268,7 +268,7 @@ namespace API
errorMsg << "Unable to parse run(s): \"" << re.what() << "\", so will treat as a single file. ";
}

std::vector<std::vector<std::string>> f = m_parser.fileNames();
std::vector<std::vector<std::string> > f = m_parser.fileNames();

// If there are no files, then we should keep this token as it was passed to the property,
// in its untampered form. This will enable us to deal with the case where a user is trying to
Expand Down Expand Up @@ -302,8 +302,8 @@ namespace API
fileNames.insert(fileNames.end(), temp.begin(), temp.end());
}

std::vector<std::vector<std::string>> allUnresolvedFileNames = fileNames;
std::vector<std::vector<std::string>> allFullFileNames;
std::vector<std::vector<std::string> > allUnresolvedFileNames = fileNames;
std::vector<std::vector<std::string> > allFullFileNames;

// First, find the default extension. Flatten all the unresolved filenames first, to make this easier.
std::vector<std::string> flattenedAllUnresolvedFileNames = flattenFileNames(allUnresolvedFileNames);
Expand Down

0 comments on commit de03cea

Please sign in to comment.