Refs #7732 fixing compiler warnings on linux

mantidproject · Nov 4, 2013 · 674602f · 674602f
1 parent 238531b
commit 674602f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
@@ -78,7 +78,7 @@ namespace Mantid
       //write the values in the current line to teh end fo teh current spectra
       void addToCurrentSpectra(std::list<std::string> & columns);
       //check that the nubmer of columns in the current line match the number found previously
-      void checkLineColumns(const int & cols) const;
+      void checkLineColumns(const size_t & cols) const;
       //interpret a line that has been deemed valid enough to look at.
       void parseLine(const std::string & line, std::list<std::string> & columns, const int & lineNo);
       //find the number of collums we should expect from now on

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp
@@ -331,7 +331,7 @@ namespace Mantid
           }
 
           std::list<std::string> columns;
-          int lineCols = this->splitIntoColumns(columns, line);
+          size_t lineCols = this->splitIntoColumns(columns, line);
           if (lineCols != 1)
           {
           try
@@ -416,7 +416,7 @@ namespace Mantid
     * Check if the file has been found to incosistantly include spectra IDs
     * @param[in] cols : the number of columns in the current line of data
     */
-    void LoadAscii2::checkLineColumns(const int & cols) const
+    void LoadAscii2::checkLineColumns(const size_t & cols) const
     {
       //a size of 2, 3 or 4 is a valid data set, but first see if it's the same as the first observed one
       if (m_baseCols != cols)

diff --git a/Code/Mantid/Framework/DataHandling/test/SaveAscii2Test.h b/Code/Mantid/Framework/DataHandling/test/SaveAscii2Test.h
@@ -69,7 +69,7 @@ class SaveAscii2Test : public CxxTest::TestSuite
     std::getline(in,binlines);
 
     boost::split(binstr, binlines,boost::is_any_of(","));
-    for (int i = 0; i < binstr.size(); i++)
+    for (size_t i = 0; i < binstr.size(); i++)
     {
       bins.push_back(boost::lexical_cast<double>(binstr.at(i)));
     }
@@ -80,7 +80,7 @@ class SaveAscii2Test : public CxxTest::TestSuite
     std::getline(in,binlines);
     bins.clear();
     boost::split(binstr, binlines,boost::is_any_of(","));
-    for (int i = 0; i < binstr.size(); i++)
+    for (size_t i = 0; i < binstr.size(); i++)
     {
       bins.push_back(boost::lexical_cast<double>(binstr.at(i)));
     }
@@ -145,7 +145,7 @@ class SaveAscii2Test : public CxxTest::TestSuite
     std::getline(in,binlines);
 
     boost::split(binstr, binlines,boost::is_any_of(","));
-    for (int i = 0; i < binstr.size(); i++)
+    for (size_t i = 0; i < binstr.size(); i++)
     {
       bins.push_back(boost::lexical_cast<double>(binstr.at(i)));
     }
@@ -156,7 +156,7 @@ class SaveAscii2Test : public CxxTest::TestSuite
     std::getline(in,binlines);
     bins.clear();
     boost::split(binstr, binlines,boost::is_any_of(","));
-    for (int i = 0; i < binstr.size(); i++)
+    for (size_t i = 0; i < binstr.size(); i++)
     {
       bins.push_back(boost::lexical_cast<double>(binstr.at(i)));
     }