diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
index 605621e19d4ab9a3c1224b93811124e6775dce21..84ec540db1f0052bcd4a2d515da4437ef37c065b 100644
--- a/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
+++ b/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
@@ -861,7 +861,6 @@ namespace Mantid
std::vector<double> params;
std::vector<double> errs;
std::vector<std::string> names;
- vector<pair<double, double> > Bounds;
if (AttributeValues->IsEnoughData( ParameterValues, g_log) && ParameterValues[ITINTENS] > 0)
{
diff --git a/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp b/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
index ba6af2747caebe00bf964f1f746404506420a6a2..bc6425697ad21708d4e8dbab01ba5317b1a76f35 100644
--- a/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
@@ -567,7 +567,7 @@ void LeBailFit::calBackground(size_t workspaceindex)
} // FOR 1 Peak in PeaksGroup
/// Background (Polynomial)
- std::string backgroundtype = getProperty("BackgroundType");
+ //std::string backgroundtype = getProperty("BackgroundType");
std::vector<double> orderparm;
for (size_t iod = 0; iod <= size_t(bkgdfuncorder); ++iod)
{
diff --git a/Code/Mantid/Framework/DataHandling/src/GroupDetectors2.cpp b/Code/Mantid/Framework/DataHandling/src/GroupDetectors2.cpp
index 684ef3d9d95785fca198b88ca52282ff44458ac6..1d5f462dedba99ad8fd8deb3046cc1e4b7d490fd 100644
--- a/Code/Mantid/Framework/DataHandling/src/GroupDetectors2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/GroupDetectors2.cpp
@@ -452,10 +452,9 @@ void GroupDetectors2::processXMLFile(std::string fname,
{
detid_t detid = detids[i];
detid2index_map::iterator ind =detIdToWiMap->find(detid);
- size_t wsid;
if ( ind != detIdToWiMap->end() )
{
- wsid = ind->second;
+ size_t wsid = ind->second;
wsindexes.push_back(wsid);
if ( unUsedSpec[wsid] != ( 1000 - INT_MAX ) )
{
@@ -487,10 +486,9 @@ void GroupDetectors2::processXMLFile(std::string fname,
{
int specid = spectra[i];
spec2index_map::iterator ind = specs2index.find(specid);
- size_t wsid;
if ( ind != specs2index.end() )
{
- wsid = ind->second;
+ size_t wsid = ind->second;
wsindexes.push_back(wsid);
if ( unUsedSpec[wsid] != ( 1000 - INT_MAX ) )
{
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDAE/idc.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDAE/idc.cpp
index 395839486bfcc7b137258340c3810bbb78c44812..227acd75cd66a8f87a6bae23063064e5506c91f4 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDAE/idc.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDAE/idc.cpp
@@ -97,7 +97,6 @@ static int getdat(idc_handle_t fh, int ifsn, int nos, int** value, int dims_arra
int spec_nos[2] = { ifsn, nos };
int spec_nos_dims[1] = { 2 };
char* command = NULL;
- char comm_buffer[256];
if (isisds_send_command(fh->s, "GETDAT", spec_nos, ISISDSInt32, spec_nos_dims, 1) <= 0)
{
IDCreport(0, 0, "error sending command (getdat)");
@@ -110,6 +109,7 @@ static int getdat(idc_handle_t fh, int ifsn, int nos, int** value, int dims_arra
}
else
{
+ char comm_buffer[256];
comm_buff_size = sizeof(comm_buffer);
stat = isisds_recv_command(fh->s, comm_buffer, &comm_buff_size, *value, &ret_type, dims_array, ndims);
}
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDAE/isisds_command.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDAE/isisds_command.cpp
index 73ba844a511a833eadb9fb444738f0fa55ff89e0..0d28677d3b166681c9a08b4694cc1ea24fe18ac1 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDAE/isisds_command.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDAE/isisds_command.cpp
@@ -339,7 +339,6 @@ static int isisds_recv_command_helper(SOCKET s, char** command, void** data, ISI
/* return > 0 on success */
int isisds_recv_command(SOCKET s, char* command, int* len_command, void* data, ISISDSDataType* type, int dims_array[], int* ndims)
{
- int t_dims[8] = { 1, 0, 0, 0, 0, 0, 0, 0 };
int t_ndims = 1;
int istat;
char* command_temp = NULL;
@@ -349,6 +348,7 @@ int isisds_recv_command(SOCKET s, char* command, int* len_command, void* data, I
}
if ( dims_array == NULL || ndims == NULL || (*ndims <= 1 && dims_array[0] <= 1) )
{
+ int t_dims[8] = { 1, 0, 0, 0, 0, 0, 0, 0 };
/* assume single simple value */
istat = isisds_recv_command_helper(s, &command_temp, &data, type, t_dims, &t_ndims, 0);
if ( (t_ndims != 1) || (t_dims[0] != 1) )
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDspacemap.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDspacemap.cpp
index 340b26ffe54f9a9659020a1075d0d0df7cdb21c9..2b3aa22a346cd290531983724d0df4cdf9f0537c 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDspacemap.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDspacemap.cpp
@@ -169,9 +169,6 @@ namespace DataHandling
dspace.push_back(read);
}
- // Selects (empty, will default to true)
- std::map<detid_t, bool> selects;
-
detid2det_map::const_iterator it;
for (it = allDetectors.begin(); it != allDetectors.end(); ++it)
{
@@ -218,9 +215,6 @@ namespace DataHandling
detid2det_map allDetectors;
instrument->getDetectors(allDetectors);
- // Selects (empty, will default to true)
- std::map<detid_t, bool> selects;
-
detid2det_map::const_iterator it;
int numfinds = 0;
g_log.notice() << "Input number of detectors = " << allDetectors.size() << std::endl;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
index 787579bf8f2158d04d892f78ac2d24421f5e8e89..2d5a1633162c97565c52ba7aeef93090caf41215 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -341,8 +341,6 @@ API::Workspace_sptr LoadNexusProcessed::loadTableEntry(NXEntry & entry)
NXData nx_tw = entry.openNXData("table_workspace");
- std::vector<double> values;
-
bool hasNumberOfRowBeenSet = false;
//int numberOfRows = 0;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw/item_struct.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRaw/item_struct.cpp
index 6aa21b93e97d0193b85c74e1ff8f3607de359db1..59b419d77bf3d91472af0d13bd08d04c9768192d 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRaw/item_struct.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRaw/item_struct.cpp
@@ -42,8 +42,6 @@ template <typename T>
int item_struct<T>::getItem(const std::string& item_name, long* spec_array, int nspec, T* lVal)
{
int i, j, n;
- std::string sitem_name;
- std::string tmp_item;
const T* pVal = NULL;
const item_t* item;
item = findItem(item_name, false);
@@ -142,7 +140,6 @@ int item_struct<T>::getArrayItemSize(const std::string& item_name, int* dims_arr
template <typename T>
int item_struct<T>::getArrayItem(const std::string& item_name, long* spec_array, int nspec, T* larray)
{
- int i, j, k, n;
const item_t* item;
item = findItem(item_name, false);
if (item == NULL)
@@ -151,6 +148,7 @@ int item_struct<T>::getArrayItem(const std::string& item_name, long* spec_array,
}
if (item != NULL)
{
+ int n;
if (item->dim1 == 0)
{
n = *(item->dim0);
@@ -159,9 +157,9 @@ int item_struct<T>::getArrayItem(const std::string& item_name, long* spec_array,
{
n = *(item->dim0) * *(item->dim1);
}
- for(k=0; k<nspec; k++)
+ for(int k=0; k<nspec; k++)
{
- for(j=0; j<n; j++)
+ for(int j=0; j<n; j++)
{
larray[j + k * n] = item->value[j];
}
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRaw2.cpp
index 4a088beff6bb5d90eae4f5c4846bc41f6d041d79..ef6c655102f779ce52f763283a0caad3d433c566 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRaw2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRaw2.cpp
@@ -114,7 +114,6 @@ namespace Mantid
// Call private method to validate the optional parameters, if set
checkOptionalProperties();
- std::vector<Kernel::Property*> period1logProp;
// Calculate the size of a workspace, given its number of periods & spectra to read
specid_t total_specs;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
index c05f9371c479902a160840d67ea56c5f44738d02..0cf5f0199ddcee76654738a4e33a4fc2dc51962e 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
@@ -114,9 +114,6 @@ void LoadRawBin0::exec()
//no real X values for bin 0,so initialize this to zero
boost::shared_ptr<MantidVec> channelsVec(new MantidVec(1,0));
m_timeChannelsVec.push_back(channelsVec);
-
- // Need to extract the user-defined output workspace name
- const std::string wsName = getPropertyValue("OutputWorkspace");
double histTotal = static_cast<double>(m_total_specs * m_numberOfPeriods);
int64_t histCurrent = -1;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawSpectrum0.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawSpectrum0.cpp
index 7ab2ffa4d1e9aa38a6ff81d826286a753cca7561..2b952ece6958d2e2b39d7b06b0ec11d5728b784e 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRawSpectrum0.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRawSpectrum0.cpp
@@ -98,9 +98,6 @@ void LoadRawSpectrum0::initDocs()
std::vector<boost::shared_ptr<MantidVec> > timeChannelsVec =
getTimeChannels(m_noTimeRegimes, m_lengthIn);
- // Need to extract the user-defined output workspace name
- const std::string localWSName = getPropertyValue("OutputWorkspace");
-
double histTotal = static_cast<double>(total_specs * m_numberOfPeriods);
int64_t histCurrent = -1;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
index 239b80d46688ed200fb222cbd0d2e6cb662f6ed2..4d60f8c0a409bedd762ab6404558dec4c3f207ae 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
@@ -313,7 +313,6 @@ void LoadSassena::init()
*/
void LoadSassena::exec()
{
- const std::string gwsName = this->getPropertyValue("OutputWorkspace");
API::WorkspaceGroup_sptr gws(new API::WorkspaceGroup);
//populate m_validSets
@@ -337,7 +336,7 @@ void LoadSassena::exec()
this->g_log.error("Unable to read version string:"+m_filename);
//throw Kernel::Exception::FileError("Unable to read version string:" , m_filename);
}
- const std::string version(cversion);
+ //const std::string version(cversion);
//determine which loader protocol to use based on the version
//to be done at a later time, maybe implement a Version class
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp
index b48859a815f1329ba4d89964ff4241cbba2746ee..4976b3db2924874b16a09f2a68472ea41f0e1ede 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp
@@ -103,7 +103,6 @@ void XMLInterface::dump(std::vector<char>& c)
int chars;
xmlChar * data;
xmlDocDumpMemory(p_doc,&data,&chars);
- std::stringstream ss;
for(int i = 0; i < chars; ++i) c.push_back(data[i]);
xmlFree(data);
}
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
index eb8769630effb8a832e17b0d71cfe1e95b0ca836..0848865ac1175692cabeab3b2fd5ce92e1dc38cd 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
@@ -104,7 +104,6 @@ int LoadTOFRawNexus::fileCheck(const std::string& filePath)
bool hasData = false;
try
{
- string_map_t::const_iterator it;
::NeXus::File file = ::NeXus::File(filePath);
string_map_t entries = file.getEntries();
for(string_map_t::const_iterator it = entries.begin(); it != entries.end(); ++it)
diff --git a/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp b/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp
index 0a56d6511263bfa683eca87afe94272b3c7860a2..02e5bd2ccde9873913d6e248f94f3320328b0277 100644
--- a/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp
@@ -143,6 +143,7 @@ namespace DataHandling
if (m_isConnected == false) // sanity check
{
throw std::runtime_error( std::string("SNSLiveEventDataListener::run(): No connection to SMS server."));
+ // cppcheck-suppress duplicateBreak
return; // should never be called, but here just in case exceptions are disabled
}
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
index d4acc2771f3fccfb70fc573816329bf8fff9a246..c038149553ef3aca695aaa7fbdf3a3502c430f4c 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
@@ -358,8 +358,7 @@ namespace DataHandling
void SaveNexusProcessed::appendEventListData( std::vector<T> events, size_t offset, double * tofs, float * weights, float * errorSquareds, int64_t * pulsetimes)
{
// Do nothing if there are no events.
- size_t num = events.size();
- if (num <= 0)
+ if (events.empty())
return;
typename std::vector<T>::const_iterator it;
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp b/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
index 463a026008ad67cc92fd99e25e45c018fc6cedff..78e5b75a2c106ee3c18e2a25bcb2d1aec4895ecc 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
@@ -142,7 +142,6 @@ namespace DataHandling
int SaveToSNSHistogramNexus::copy_file(const char* inFile, int nx_read_access, const char* outFile, int nx_write_access)
{
int nx_is_definition = 0;
- char* tstr;
links_count = 0;
current_path[0] = '\0';
NXlink link;
@@ -183,7 +182,7 @@ namespace DataHandling
if (NXgetdataID(outId, &link) == NX_OK || NXgetgroupID(outId, &link) == NX_OK)
{
if (NXopenpath(outId, links_to_make[i].from) != NX_OK) return NX_ERROR;
- tstr = strrchr(links_to_make[i].to, '/');
+ char* tstr = strrchr(links_to_make[i].to, '/');
if (!strcmp(links_to_make[i].name, tstr+1))
{
if (NXmakelink(outId, &link) != NX_OK) return NX_ERROR;
diff --git a/Code/Mantid/Framework/DataHandling/src/SetScalingPSD.cpp b/Code/Mantid/Framework/DataHandling/src/SetScalingPSD.cpp
index 91414d25dcfd1c154575ee6d50a4bb61b1f599e5..443aea6d06214b2e0dad9798254bacd6caac3790 100644
--- a/Code/Mantid/Framework/DataHandling/src/SetScalingPSD.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SetScalingPSD.cpp
@@ -145,7 +145,6 @@ namespace DataHandling
// which may be necessary for each pixel if in a tube.
// movePos is used to updated positions
std::map<int,Kernel::V3D> posMap;
- std::map<int,Kernel::V3D>::iterator it;
std::map<int,double> scaleMap;
std::map<int,double>::iterator its;
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/ScalarUtils.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/ScalarUtils.cpp
index e40cc32035edff3a1f85681f4924c5cd4f7d8bac..3009fcaed3a4ec2f08843dd921a70d601439dd3a 100644
--- a/Code/Mantid/Framework/Geometry/src/Crystal/ScalarUtils.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Crystal/ScalarUtils.cpp
@@ -88,7 +88,6 @@ std::vector<ConventionalCell> ScalarUtils::GetCells(
bool best_only )
{
std::vector<ConventionalCell> result;
- std::vector<ConventionalCell> temp;
size_t num_lattices = 15;
for ( size_t i = 0; i < num_lattices; i++ )
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/Component.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/Component.cpp
index 19681af671f180a16830bedaa1d86f77cb1a153e..9e1f8e3645c9340f71d7c2d61430092c242f0fbb 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/Component.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/Component.cpp
@@ -161,29 +161,15 @@ namespace Geometry
{
std::vector<boost::shared_ptr<const IComponent> > ancs;
- if (m_isParametrized)
- {
- boost::shared_ptr<const IComponent> current = this->getParent();
- while (current)
- {
- ancs.push_back( current );
- current = current->getParent();
- }
- }
- else
+ boost::shared_ptr<const IComponent> current = this->getParent();
+ while (current)
{
- boost::shared_ptr<const IComponent> current = this->getParent();
- while (current)
- {
- ancs.push_back( current );
- current = current->getParent();
- }
+ ancs.push_back( current );
+ current = current->getParent();
}
-
return ancs;
}
-
//--------------------------------------------------------------------------------------------
/** Set the name of the Component (currently does nothing)
* @param s :: name string
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp
index ac8cef212b105e9ac56ec2f3f72db1322dc4f9a6..de808d3863d48279d983cadadee1c72e571ffe36 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp
@@ -107,7 +107,6 @@ namespace Mantid
m_radius = radius;
std::map<detid_t, V3D> nearest = defaultNeighbours(spectrum);
- std::map<specid_t, V3D>::const_iterator cend;
for(std::map<specid_t, V3D>::const_iterator cit = nearest.begin();
cit != nearest.end(); ++cit )
{
diff --git a/Code/Mantid/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp b/Code/Mantid/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
index a233ba3f9e5fcfebefc2fcd7ea78900a72a8eb66..73f95a042b520891db9138fd671a5754281c12b6 100644
--- a/Code/Mantid/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
+++ b/Code/Mantid/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
@@ -205,7 +205,6 @@ template <typename CheckDimensionPolicy>
const std::string& MDGeometryBuilderXML<CheckDimensionPolicy>::create() const
{
using namespace Poco::XML;
- std::string formattedXMLString;
if(true == m_changed)
{
//Create the root element for this fragment.
diff --git a/Code/Mantid/Framework/Geometry/src/Math/mathSupport.cpp b/Code/Mantid/Framework/Geometry/src/Math/mathSupport.cpp
index e6df7e9203419fe049671e55136319920483a1fd..936e260b3dad4011c845465d517b2918d5de8b01 100644
--- a/Code/Mantid/Framework/Geometry/src/Math/mathSupport.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Math/mathSupport.cpp
@@ -73,8 +73,8 @@ solveCubic(const CInputIter Coef,std::complex<double>& AnsA,
{
typedef std::complex<double> Cpair;
double q,r; /* solution parameters */
- double s,t,termR,termI,discrim;
- double q3,r13;
+ double termR,discrim;
+ double r13;
std::pair<std::complex<double>,std::complex<double> > SQ;
if ((*Coef)==0)
@@ -109,14 +109,14 @@ solveCubic(const CInputIter Coef,std::complex<double>& AnsA,
if (discrim > 1e-13) /* one root real, two are complex */
{
- s = r + sqrt(discrim);
+ double s = r + sqrt(discrim);
s = ((s < 0) ? -pow(-s, (1.0/3.0)) : pow(s, (1.0/3.0)));
- t = r - sqrt(discrim);
+ double t = r - sqrt(discrim);
t = ((t < 0) ? -pow(-t, (1.0/3.0)) : pow(t, (1.0/3.0)));
AnsA=Cpair(-termR+s+t,0.0);
// second real point.
termR += (s + t)/2.0;
- termI = sqrt(3.0)*(-t + s)/2;
+ double termI = sqrt(3.0)*(-t + s)/2;
AnsB=Cpair(-termR,termI);
AnsC=Cpair(-termR,-termI);
return 3;
@@ -127,7 +127,7 @@ solveCubic(const CInputIter Coef,std::complex<double>& AnsA,
if (discrim<1e-13) // All roots real
{
q = -q;
- q3 = q*q*q;
+ double q3 = q*q*q;
q3 = acos(-r/sqrt(q3));
r13 = -2.0*sqrt(q);
AnsA=Cpair(-termR + r13*cos(q3/3.0),0.0);
diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
index 42e852eca98eef706b066181389165840a3e3b6a..a35f69c074606a3ab1609a4a3c8e9fa2b72886d0 100644
--- a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
+++ b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1207,6 +1207,7 @@ std::string ConfigServiceImpl::getPathToExecutable() const
{
std::string execpath("");
const size_t LEN(1024);
+ // cppcheck-suppress variableScope
char pBuf[LEN];
#ifdef _WIN32
diff --git a/Code/Mantid/Framework/Kernel/src/Matrix.cpp b/Code/Mantid/Framework/Kernel/src/Matrix.cpp
index e44a44e4254a0736ac40e5711b90db7c38d2cfbb..8dd13381d9d79c1e2dcb3f7ef460836820086b88 100644
--- a/Code/Mantid/Framework/Kernel/src/Matrix.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Matrix.cpp
@@ -1580,7 +1580,6 @@ Matrix<T>::Diagonalise(Matrix<T>& EigenVec,Matrix<T>& DiagMatrix) const
{
// Make OUTPUT -- D + A
// sort Output::
- std::vector<int> index;
for(size_t ix=0;ix<nx;ix++)
DiagMatrix.V[ix][ix]=static_cast<T>(Diag[ix]);
return 1;
diff --git a/Code/Mantid/Framework/Kernel/src/RegexStrings.cpp b/Code/Mantid/Framework/Kernel/src/RegexStrings.cpp
index 0c28fdb8bc502116f49a4b179fe23f863a50ca4f..5f585ed622ef1d818c055707cf51b2473fb79182 100644
--- a/Code/Mantid/Framework/Kernel/src/RegexStrings.cpp
+++ b/Code/Mantid/Framework/Kernel/src/RegexStrings.cpp
@@ -227,15 +227,14 @@ int StrRemove(std::string& Sdx,std::string& Extract,const boost::regex& Re)
boost::cmatch ans;
if (boost::regex_search(Sdx.c_str(),ans,Re,boost::match_default))
- {
- if (!ans[0].matched) // no match
- return 0;
- std::string xout(ans[0].first,ans[0].second);
- Extract=std::string(ans[0].first,ans[0].second);
- Sdx= std::string(Sdx.c_str(),ans[0].first)+
- std::string(ans[0].second);
- return 1;
- }
+ {
+ if (!ans[0].matched) // no match
+ return 0;
+ Extract=std::string(ans[0].first,ans[0].second);
+ Sdx= std::string(Sdx.c_str(),ans[0].first)+
+ std::string(ans[0].second);
+ return 1;
+ }
return 0;
}
diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
index c410435426349297a86ebf0580fcae1ca9096ae0..0757c9b2591b591d8826278945ab17a639e52562 100644
--- a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -344,12 +344,12 @@ namespace Mantid
// 0. Sort if necessary
sort();
- size_t numOutputs = outputs.size();
- if (numOutputs <= 0)
+ if (outputs.empty())
return;
std::vector< TimeSeriesProperty<TYPE> *> outputs_tsp;
+ size_t numOutputs = outputs.size();
// 1. Clear the outputs before you start
for (size_t i=0; i < numOutputs; i++)
{
diff --git a/Code/Mantid/Framework/Kernel/src/UserStringParser.cpp b/Code/Mantid/Framework/Kernel/src/UserStringParser.cpp
index b4a1d0ff309057c7e42768d81dab37474e37a516..4a985ab9667062d54afec5e31bc481a00156058c 100644
--- a/Code/Mantid/Framework/Kernel/src/UserStringParser.cpp
+++ b/Code/Mantid/Framework/Kernel/src/UserStringParser.cpp
@@ -58,7 +58,6 @@ namespace Mantid
//look for separators
std::string separators("-+:");
- std::vector<unsigned int>value;
//if input contains no separator string
if(userString.find_first_of(separators)==std::string::npos)
{
@@ -178,7 +177,6 @@ namespace Mantid
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
boost::char_separator<char> seps(delimiter.c_str());
- std::vector<unsigned int> separatedValues;
std::vector<std::string> temp;
tokenizer tokens(input,seps);
for(tokenizer::const_iterator tokItr=tokens.begin();tokItr!=tokens.end();++tokItr)
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/TobyFitSimulate.cpp b/Code/Mantid/Framework/MDAlgorithms/src/TobyFitSimulate.cpp
index afebf64026f7c4b966c095809d7996e90ea8484d..7b98ad580e31059f640c51513c5d1a4fa4d7a870 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/TobyFitSimulate.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/TobyFitSimulate.cpp
@@ -474,7 +474,7 @@ namespace Mantid
UNUSED_ARG(detTimeBin);
UNUSED_ARG(detWidth);
- const double rt6 = 2.449489742783178098; // sqrt(6)
+
int imc(0);
// this may need to be optimised
@@ -510,7 +510,8 @@ namespace Mantid
yVec[4] = 0.0;
if (m_mcOptVec[mcChopperJitter]) {
- yVec[4] += + m_tjit_sig * rt6 * tridev(ranvec[imc++]);
+ const double rt6 = 2.449489742783178098; // sqrt(6)
+ yVec[4] += + m_tjit_sig * rt6 * tridev(ranvec[imc++]);
}
// Sample over crystal volume: