diff --git a/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h b/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h index ea38ebab36b62cd010dd9c969d10f201c501bc4c..d2f7532e2cbc4c26fc9ba96a40d2d2e870c44d5e 100644 --- a/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h +++ b/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h @@ -283,7 +283,7 @@ public: { boost::shared_ptr<MatrixWorkspace> ws(new WorkspaceTester()); ws->initialize(4,1,1); - ISpectrum * spec; + ISpectrum * spec = NULL; TS_ASSERT_THROWS_NOTHING( spec = ws->getSpectrum(0) ); TS_ASSERT(spec); TS_ASSERT_THROWS_NOTHING( spec = ws->getSpectrum(3) ); diff --git a/Code/Mantid/Framework/Algorithms/src/FFTDerivative.cpp b/Code/Mantid/Framework/Algorithms/src/FFTDerivative.cpp index 11ab198aa18b2c50f3a7875aa136c1041fa5e276..cd5a361216cf1175496b7c6d648b21759c9ea012 100644 --- a/Code/Mantid/Framework/Algorithms/src/FFTDerivative.cpp +++ b/Code/Mantid/Framework/Algorithms/src/FFTDerivative.cpp @@ -149,8 +149,8 @@ void FFTDerivative::execComplexFFT() transWS = fft->getProperty("OutputWorkspace"); size_t m2 = transWS->readY(0).size() / 2; - size_t my = m2 + (transWS->readY(0).size() % 2 ? 1 : 0); - size_t mx = my + (transWS->isHistogramData() ? 1 : 0); + //size_t my = m2 + (transWS->readY(0).size() % 2 ? 1 : 0); + //size_t mx = my + (transWS->isHistogramData() ? 1 : 0); if (!outWS) { diff --git a/Code/Mantid/Framework/Algorithms/src/Integration.cpp b/Code/Mantid/Framework/Algorithms/src/Integration.cpp index cdf4f2659a67814fede11254b7abf3c4aef21b73..d9e09ec9beb6836cddfdf855a6899423312bbfa2 100644 --- a/Code/Mantid/Framework/Algorithms/src/Integration.cpp +++ b/Code/Mantid/Framework/Algorithms/src/Integration.cpp @@ -249,7 +249,7 @@ void Integration::execEvent() outputWS = boost::dynamic_pointer_cast<EventWorkspace>( API::WorkspaceFactory::Instance().create("EventWorkspace", m_MaxSpec-m_MinSpec+1, 2, 1)); //Copy geometry over. - bool differentSize = (m_MaxSpec-m_MinSpec+1) != inputEventWS->getNumberHistograms(); + bool differentSize = (m_MaxSpec-m_MinSpec+1) != static_cast<int>(inputEventWS->getNumberHistograms()); API::WorkspaceFactory::Instance().initializeFromParent(inputEventWS, outputWS, differentSize); //You need to copy over the data as well. // -- we copy only a range, if specified. diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp index 483b0a4fef50957d9a0c5c4a48347cff44c157f8..5fcbf96ff673c575397192d4cb84d02d3da21ad8 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp @@ -292,7 +292,7 @@ API::MatrixWorkspace_sptr LoadNexusProcessed::loadEventEntry(NXData & wksp_cls, /** * Load a table */ -API::Workspace_sptr LoadNexusProcessed::loadTableEntry(NXEntry & entry) +API::Workspace_sptr LoadNexusProcessed::loadTableEntry(NXEntry & /*entry*/) { // Get workspace characteristics //NXData wksp_cls = mtd_entry.openNXData("table_workspace"); diff --git a/Code/Mantid/Framework/DataHandling/src/MaskDetectors.cpp b/Code/Mantid/Framework/DataHandling/src/MaskDetectors.cpp index 4870f117cf2b0b9b559643546dd83f977688917c..f548b9e0191cc1b1b5eff29cedc19d09dd002328 100644 --- a/Code/Mantid/Framework/DataHandling/src/MaskDetectors.cpp +++ b/Code/Mantid/Framework/DataHandling/src/MaskDetectors.cpp @@ -60,8 +60,6 @@ void MaskDetectors::exec() { // Get the input workspace const MatrixWorkspace_sptr WS = getProperty("Workspace"); - // Get the size of the vectors - const size_t vectorSize = WS->blocksize(); //Is it an event workspace? EventWorkspace_sptr eventWS = boost::dynamic_pointer_cast<EventWorkspace>(WS); diff --git a/Code/Mantid/Framework/DataObjects/test/Workspace2DTest.h b/Code/Mantid/Framework/DataObjects/test/Workspace2DTest.h index c06f3373387e3be30b733d3f5755ad2849e3c86f..514973470fedfca891b6ee84a4f3a144f4a87db0 100644 --- a/Code/Mantid/Framework/DataObjects/test/Workspace2DTest.h +++ b/Code/Mantid/Framework/DataObjects/test/Workspace2DTest.h @@ -204,7 +204,7 @@ public: { boost::shared_ptr<MatrixWorkspace> ws(new Workspace2D()); ws->initialize(4,1,1); - ISpectrum * spec; + ISpectrum * spec = NULL; TS_ASSERT_THROWS_NOTHING( spec = ws->getSpectrum(0) ); TS_ASSERT(spec); TS_ASSERT_THROWS_NOTHING( spec = ws->getSpectrum(3) ); diff --git a/Code/Mantid/Framework/Nexus/src/MuonNexusReader.cpp b/Code/Mantid/Framework/Nexus/src/MuonNexusReader.cpp index 39804bf98ee67d5c420a22b69ef4a9255bb6b98a..bc40517d3375d6a72aeb91f7c87fea511108a6ef 100644 --- a/Code/Mantid/Framework/Nexus/src/MuonNexusReader.cpp +++ b/Code/Mantid/Framework/Nexus/src/MuonNexusReader.cpp @@ -352,7 +352,7 @@ void MuonNexusReader::getLogStringValues(const int& logNumber, const int& logSeq double time=logTimes[logNumber][logSequence]; logTime=static_cast<std::time_t>(time)+startTime_time_t; std::vector<std::string>& strings = logStringValues[logNumber]; - if (logSequence < strings.size()) + if (logSequence < int(strings.size())) { value = strings[logSequence]; } diff --git a/Code/Mantid/Framework/Nexus/src/NexusFileIO.cpp b/Code/Mantid/Framework/Nexus/src/NexusFileIO.cpp index d24f188f81734c0250a5ce9569d1e32d7162f7e8..59ab08663495128cfd2a73cd695b7231452c06ff 100644 --- a/Code/Mantid/Framework/Nexus/src/NexusFileIO.cpp +++ b/Code/Mantid/Framework/Nexus/src/NexusFileIO.cpp @@ -706,7 +706,7 @@ using namespace DataObjects; int NexusFileIO::writeNexusTableWorkspace( const API::ITableWorkspace_const_sptr& itableworkspace, const char * group_name) const { - NXstatus status; + NXstatus status = 0; boost::shared_ptr<const TableWorkspace> tableworkspace = boost::dynamic_pointer_cast<const TableWorkspace>(itableworkspace); @@ -736,7 +736,7 @@ using namespace DataObjects; std::string str = "column_" + boost::lexical_cast<std::string>(i+1); std::string bob = col->get_type_info().name(); - if ( col->get_type_info().name() == "double" ) + if ( col->get_type_info().name() == std::string("double") ) { double * toNexus = new double[nRows]; for (int ii = 0; ii < nRows; ii++) diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ColorMapWidget.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ColorMapWidget.cpp index 789f3764d46c17adae4467b66d502eedb97d7a60..34b454283632d49edce5c2f168da79d769c84dc2 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ColorMapWidget.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ColorMapWidget.cpp @@ -190,7 +190,7 @@ void ColorMapWidget::mouseMoveEvent(QMouseEvent* e) } } -void ColorMapWidget::mouseReleaseEvent(QMouseEvent* e) +void ColorMapWidget::mouseReleaseEvent(QMouseEvent* /*e*/) { if (!m_dragging) return; if (m_dtype == Bottom) diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp index 7ab6009829902cde45c0cc69620a79db7e2d9c57..a85826bed76ad1deda54047a5869faa525c2103f 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp @@ -417,8 +417,8 @@ void Projection3D::componentSelected(Mantid::Geometry::ComponentID id) //std::cerr << minBounds << maxBounds << std::endl; // cannot get it right - double znear = minBounds.Z(); - double zfar = maxBounds.Z(); +// double znear = minBounds.Z(); +// double zfar = maxBounds.Z(); //if (znear > zfar) //{ // std::swap(znear,zfar); diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidTable.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidTable.cpp index 6c3a5588f9f5b586c5e67910b0448af401403681..d785fc30d64b8067ae3a78bffecc7d0407f9523f 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/MantidTable.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/MantidTable.cpp @@ -21,7 +21,7 @@ using namespace MantidQt::API; * @return the MantidTable created */ MantidTable::MantidTable(ScriptingEnv *env, Mantid::API::ITableWorkspace_sptr ws, const QString &label, - ApplicationWindow* parent, const QString& name, Qt::WFlags f): + ApplicationWindow* parent, const QString& /*name*/, Qt::WFlags f): Table(env,ws->rowCount(),ws->columnCount(),label,parent,"",f), m_ws(ws), m_wsName(ws->getName())