Re #4158. Fixing some warnings

mantidproject · Apr 2, 2012 · b3f1d9c · b3f1d9c
1 parent 5a175ec
commit b3f1d9c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain1D.h b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain1D.h
@@ -55,7 +55,7 @@ class MANTID_API_DLL FunctionDomain1D: public FunctionDomain
   /// Protected constructor, shouldn't be created directly. Use FunctionDomain1DView instead.
   FunctionDomain1D(const double* x, size_t n):m_data(x),m_n(n){}
   /// Reset the pointer and size of the domain
-  void reset(const double* x, size_t n)
+  void resetData(const double* x, size_t n)
   {
     m_data = x;
     m_n = n;

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h
@@ -235,7 +235,7 @@ class MANTID_API_DLL IFunction
   virtual std::string asString()const;
   /// Set the workspace.
   /// @param ws :: Shared pointer to a workspace
-  virtual void setWorkspace(boost::shared_ptr<const Workspace> ws) {}
+  virtual void setWorkspace(boost::shared_ptr<const Workspace> ws) {UNUSED_ARG(ws);}
   /// Set matrix workspace
   void setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,size_t wi,double startX, double endX);
   /// Iinialize the function

diff --git a/Code/Mantid/Framework/API/src/FunctionDomain1D.cpp b/Code/Mantid/Framework/API/src/FunctionDomain1D.cpp
@@ -21,7 +21,7 @@ FunctionDomain1D(NULL,0)
     throw std::invalid_argument("FunctionDomain1D cannot have zero size.");
   }
   m_X.assign(xvalues.begin(),xvalues.end());
-  reset(&m_X[0],m_X.size());
+  resetData(&m_X[0],m_X.size());
 }
 
 FunctionDomain1DVector::FunctionDomain1DVector(std::vector<double>::const_iterator from, std::vector<double>::const_iterator to):
@@ -32,7 +32,7 @@ FunctionDomain1D(NULL,0)
     throw std::invalid_argument("FunctionDomain1D cannot have zero size.");
   }
   m_X.assign(from,to);
-  reset(&m_X[0],m_X.size());
+  resetData(&m_X[0],m_X.size());
 }
 
 FunctionDomain1DVector::FunctionDomain1DVector(const double startX, const double endX, const size_t n):
@@ -55,15 +55,15 @@ FunctionDomain1D(NULL,0)
       m_X[i] = startX + dx * i;
     }
   }
-  reset(&m_X[0],m_X.size());
+  resetData(&m_X[0],m_X.size());
 }
 
 FunctionDomain1DVector::FunctionDomain1DVector(const double x):
 FunctionDomain1D(NULL,0)
 {
   m_X.resize(1);
   m_X[0] = x;
-  reset(&m_X[0],m_X.size());
+  resetData(&m_X[0],m_X.size());
 }
 
 /**
@@ -87,7 +87,7 @@ FunctionDomain1DVector& FunctionDomain1DVector::operator=(const FunctionDomain1D
     throw std::invalid_argument("FunctionDomain1D cannot have zero size.");
   }
   m_X.assign(right.m_X.begin(),right.m_X.end());
-  reset(&m_X[0],m_X.size());
+  resetData(&m_X[0],m_X.size());
   return *this;
 }