Commit 97d5f0cb authored by David E. DeMarle's avatar David E. DeMarle

COMP: Fix shadowed, unused, unreachable code and type conversion comp warnings.

parent 44ca38fb
......@@ -67,7 +67,12 @@ vtkProcessModule::InterpreterInitializationCallback
}
//-----------------------------------------------------------------------------
void @PLUGIN_NAME@_Plugin::GetXMLs(vtkstd::vector<vtkstd::string> &xmls)
void @PLUGIN_NAME@_Plugin::GetXMLs
# ifdef PUSH_BACK_XML_INTERFACES
(vtkstd::vector<vtkstd::string> &xmls)
#else
(vtkstd::vector<vtkstd::string> &)
# endif
{
# ifdef PUSH_BACK_XML_INTERFACES
PUSH_BACK_XML_INTERFACES(xmls);
......@@ -79,11 +84,11 @@ void @PLUGIN_NAME@_Plugin::GetXMLs(vtkstd::vector<vtkstd::string> &xmls)
#ifdef plugin_type_gui
QObjectList @PLUGIN_NAME@_Plugin::interfaces()
{
QObjectList interfaces;
QObjectList ifaces;
#ifdef PUSH_BACK_PV_INTERFACES
PUSH_BACK_PV_INTERFACES(interfaces);
PUSH_BACK_PV_INTERFACES(ifaces);
#endif
return interfaces;
return ifaces;
}
#endif
......
......@@ -646,7 +646,12 @@ void CosmoHaloFinderP::mergeHalos()
//
/////////////////////////////////////////////////////////////////////////
void CosmoHaloFinderP::collectMixedHalos(ID_T* haloBuffer, int haloBufSize)
void CosmoHaloFinderP::collectMixedHalos
#ifdef USE_SERIAL_COSMO
(ID_T* , int )
#else
(ID_T* haloBuffer, int haloBufSize)
#endif
{
// How many processors have mixed halos
int haveMixedHalo = (this->numberOfMixedHalos > 0 ? 1 : 0);
......
......@@ -251,7 +251,12 @@ void Message::getValue(char* data, int count)
// Nonblocking send
//
////////////////////////////////////////////////////////////////////////////
void Message::send(int mach, int tag)
void Message::send
#ifdef USE_SERIAL_COSMO
(int , int )
#else
(int mach, int tag)
#endif
{
#ifdef USE_SERIAL_COSMO
char* in = new char[this->bufPos];
......
......@@ -106,8 +106,6 @@ void Partition::initialize()
for (int dim = 0; dim < DIMENSION; dim++)
decompSize[dim] = 0;
int periodic[] = {1, 1, 1};
int reorder = 1;
#ifdef USE_SERIAL_COSMO
myProc = 0;
......@@ -119,6 +117,9 @@ void Partition::initialize()
myPosition[dim] = 0;
}
#else
int periodic[] = {1, 1, 1};
int reorder = 1;
// Compute the number of processors in each dimension
MPI_Dims_create(numProc, DIMENSION, decompSize);
......@@ -189,7 +190,12 @@ void Partition::getNeighbors(int neigh[])
//
/////////////////////////////////////////////////////////////////////////
int Partition::getNeighbor(int xpos, int ypos, int zpos)
int Partition::getNeighbor
#ifdef USE_SERIAL_COSMO
(int , int , int )
#else
(int xpos, int ypos, int zpos)
#endif
{
#ifdef USE_SERIAL_COSMO
return 0;
......
......@@ -256,7 +256,12 @@ void pqParaViewMenuBuilders::buildPipelineBrowserContextMenu(QWidget& widget)
}
//-----------------------------------------------------------------------------
void pqParaViewMenuBuilders::buildMacrosMenu(QMenu& menu)
void pqParaViewMenuBuilders::buildMacrosMenu
#ifdef PARAVIEW_ENABLE_PYTHON
(QMenu& menu)
#else
(QMenu& )
#endif
{
#ifdef PARAVIEW_ENABLE_PYTHON
// Give the macros menu to the pqPythonMacroSupervisor
......
......@@ -202,19 +202,19 @@ void pqProgressManager::onEndProgress()
//-----------------------------------------------------------------------------
void pqProgressManager::onProgress()
{
int progress = vtkProcessModule::GetProcessModule()->GetLastProgress();
int oldProgress = vtkProcessModule::GetProcessModule()->GetLastProgress();
QString text = vtkProcessModule::GetProcessModule()->GetLastProgressName();
// forgive those who don't call SendPrepareProgress beforehand
if (this->EnableProgress == false &&
this->ReadyEnableProgress == false && progress == 0)
this->ReadyEnableProgress == false && oldProgress == 0)
{
this->onStartProgress();
return;
}
// forgive those who don't cleanup or want to go the extra mile
if (progress >= 100)
if (oldProgress >= 100)
{
this->onEndProgress();
return;
......@@ -246,5 +246,5 @@ void pqProgressManager::onProgress()
{
text = text.mid(3);
}
this->setProgress(text, progress);
this->setProgress(text, oldProgress);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment