Skip to content

Commit

Permalink
Refs #7732 ran the VS auto formatter on my new files
Browse files Browse the repository at this point in the history
  • Loading branch information
keithnbrown committed Nov 4, 2013
1 parent 7ea0f5d commit 6763e3b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
Expand Up @@ -23,7 +23,7 @@ namespace Mantid
<li>Unit - the unit to assign to the X axis (default: Energy).</li>
</ul>
@author Keith Brown, ISIS, Placement student from the University of Derby
@author Keith Brown, ISIS, Placement student from the University of Derby
@date 10/10/13
Copyright &copy; 2007-2010 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
Expand Down
20 changes: 10 additions & 10 deletions Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp
Expand Up @@ -336,18 +336,18 @@ namespace Mantid
size_t lineCols = this->splitIntoColumns(columns, line);
if (lineCols != 1)
{
try
{
fillInputValues(values, columns);
}
catch(boost::bad_lexical_cast&)
{
continue;
}
try
{
fillInputValues(values, columns);
}
catch(boost::bad_lexical_cast&)
{
continue;
}
}
if( numCols == 0 )
{
numCols = lineCols;
numCols = lineCols;
}
if( lineCols == m_baseCols || (lineCols == 1))
{
Expand Down Expand Up @@ -590,7 +590,7 @@ namespace Mantid
units.insert(units.begin(),"Dimensionless");
declareProperty("Unit","Energy", boost::make_shared<StringListValidator>(units),
"The unit to assign to the X axis (anything known to the [[Unit Factory]] or \"Dimensionless\")");

auto mustBePosInt = boost::make_shared<BoundedValidator<int> >();
mustBePosInt->setLower(0);
declareProperty("SkipNumLines", EMPTY_INT(), mustBePosInt,
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/DataHandling/src/SaveAscii2.cpp
Expand Up @@ -129,7 +129,7 @@ namespace Mantid
if(m_sep.empty())
{
g_log.notice() << "\"UserDefined\" has been selected, but no custom separator has been entered."
" Using default instead.";
" Using default instead.";
m_sep = ",";
}

Expand All @@ -144,7 +144,7 @@ namespace Mantid
if (comment.at(0) == m_sep.at(0)||!boost::regex_match(comment.begin(), comment.end(), boost::regex("[^0-9e" + m_sep + "+-]+", boost::regex::perl)))
{
throw std::invalid_argument("Comment markers cannot contain numeric characters, plus signs, hyphens,"
" 'e' or the selected separator character");
" 'e' or the selected separator character");
}

// Create an spectra index list for output
Expand Down

0 comments on commit 6763e3b

Please sign in to comment.