Commit fc0c7875 authored by hkrishna's avatar hkrishna

warning fixes for visitpy directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23641 18c085ea-50e0-402c-830e-de6fd14e8384
parent 008d70c9
......@@ -206,11 +206,16 @@ main(int argc, char *argv[])
bool verbose = false, s_found = false;
bool pyside = false;
bool pyside_gui = false,pyside_viewer = false;
char *runFile = 0, *loadFile = 0, tmpArg[512];
char *runFile = 0, *loadFile = 0;
char **argv2 = new char *[argc];
char **argv_after_s = new char *[argc];
int argc2 = 0, argc_after_s = 0;
char* uifile = 0;
const char* pyuiembedded_str = "-pyuiembedded"; //pass it along to client
#ifdef WIN32
char tmpArg[512];
#endif
#ifdef IGNORE_HUPS
signal(SIGHUP, SIG_IGN);
......@@ -345,19 +350,19 @@ main(int argc, char *argv[])
{
pyside_gui = true;
pyside_viewer = true;
argv2[argc2++] = "-pyuiembedded"; //pass it along to client
argv2[argc2++] = const_cast<char*>(pyuiembedded_str); //pass it along to client
}
else if(strcmp(argv[i], "-pysideclient") == 0)
{
pyside_gui = true;
argv2[argc2++] = "-pyuiembedded"; //pass it along to client
argv2[argc2++] = const_cast<char*>(pyuiembedded_str); //pass it along to client
}
else if(strcmp(argv[i], "-uifile") == 0)
{
pyside_gui = true;
uifile = argv[i+1];
++i;
argv2[argc2++] = "-pyuiembedded"; //pass it along to client
argv2[argc2++] = const_cast<char*>(pyuiembedded_str); //pass it along to client
}
else if(strcmp(argv[i], "-dv") == 0)
{
......
......@@ -1359,7 +1359,7 @@ static std::string log_QueryRPC(ViewerRPC *rpc)
MapNode *t_o = queryParams.GetEntry("time_options");
stringVector t_o_names;
t_o->GetEntryNames(t_o_names);
for (size_t j = 0; j < t_o->GetNumEntries(); ++j)
for (size_t j = 0; j < (size_t)t_o->GetNumEntries(); ++j)
{
if (numPrinted > 0)
s += ", ";
......
......@@ -803,7 +803,7 @@ static bool ImageObjectEnableLogging = true;
static void
PyImageObject_WriteLog(Subject *subj, void *data)
{
AnnotationObject *atts = (AnnotationObject *)subj;
AnnotationObject *atts = (AnnotationObject *)subj; (void) atts;
FILE *logFile = (FILE *)data;
if(!ImageObjectEnableLogging || (logFile == NULL))
......
......@@ -802,7 +802,7 @@ static bool LineObjectEnableLogging = true;
static void
PyLineObject_WriteLog(Subject *subj, void *data)
{
AnnotationObject *atts = (AnnotationObject *)subj;
AnnotationObject *atts = (AnnotationObject *)subj; (void) atts;
FILE *logFile = (FILE *)data;
if(!LineObjectEnableLogging || (logFile == NULL))
......
......@@ -128,7 +128,7 @@ PyDict_To_MapNode(PyObject *obj, MapNode &mn)
if (!PyDict_Check(obj))
return false;
bool success = true;
//bool success = true;
Py_ssize_t pos = 0;
PyObject *key = NULL;
PyObject *value = NULL;
......
......@@ -113,7 +113,7 @@ SILRestriction_Categories(PyObject *self, PyObject *args)
// Allocate a tuple the with enough entries to hold the Collection name list.
PyObject *retval = PyTuple_New(mapsOut.size());
for(int i = 0; i < mapsOut.size(); ++i)
for(size_t i = 0; i < mapsOut.size(); ++i)
{
int cIndex = mapsOut[i];
avtSILCollection_p collection = silr->GetSILCollection(cIndex);
......@@ -736,7 +736,7 @@ SILRestriction_Wholes(PyObject *self, PyObject *args)
// Allocate a tuple the with enough entries to hold the wholes.
PyObject *retval = PyTuple_New(silr->GetWholes().size());
for(int i = 0; i < silr->GetWholes().size(); ++i)
for(size_t i = 0; i < silr->GetWholes().size(); ++i)
{
PyObject *dval = PyLong_FromLong((long)silr->GetWholes()[i]);
if(dval == NULL)
......
......@@ -91,7 +91,7 @@ struct Text3DObjectObject
//
// Internal prototypes
//
static PyObject *NewText3DObject(int);
static PyObject *NewText3DObject(); ///TODO: check fix for function signature update
std::string
PyText3DObject_ToString(const AnnotationObject *atts, const char *prefix)
......
......@@ -121,6 +121,7 @@ PyTuple_FromIntVector(const intVector &vec)
return tuple;
}
#if 0
static PyObject *
PyTuple_FromDoubleVector(const doubleVector &vec)
{
......@@ -138,6 +139,7 @@ PyTuple_FromDoubleVector(const doubleVector &vec)
}
return tuple;
}
#endif
static PyObject *
PyTuple_FromDoubleArray(const double *vec, int len)
......
......@@ -679,7 +679,7 @@ DeprecatedMessage(const char *deprecatedFunction, const char *ver,
"***\n",
deprecatedFunction, ver, deprecatedFunction, newFunction);
}
#if 0
// ****************************************************************************
// Method: StringVectorToTupleString
//
......@@ -721,6 +721,7 @@ StringVectorToTupleString(const stringVector &s)
return str;
}
#endif
// ****************************************************************************
// Method: GetStringVectorFromPyObject
......@@ -2140,7 +2141,7 @@ visit_GetTimeSliders(PyObject *self, PyObject *args)
// Create a dictionary object and put the time sliders in it.
PyObject *dict = PyDict_New();
for(int i = 0; i < timeSliders.size(); ++i)
for(size_t i = 0; i < timeSliders.size(); ++i)
{
PyObject *tsName = PyString_FromString(timeSliders[i].c_str());
PyObject *tsValue = PyInt_FromLong(timeSliderStates[i]);
......@@ -3792,7 +3793,7 @@ visit_CloseComputeEngine(PyObject *self, PyObject *args)
{
const stringVector &engines = GetViewerState()->GetEngineList()->GetEngineName();
const stringVector &sims = GetViewerState()->GetEngineList()->GetSimulationName();
for (int i=0; i<engines.size(); i++)
for (size_t i=0; i<engines.size(); i++)
{
if (engines[i] == engineName)
{
......@@ -4997,7 +4998,7 @@ visit_SaveSession(PyObject *self, PyObject *args)
std::string session_file(filename);
// check for ".session" extension
int rpos = session_file.rfind(".session");
size_t rpos = session_file.rfind(".session");
if( rpos == std::string::npos || rpos != session_file.size() - 8)
session_file += ".session";
......@@ -5034,7 +5035,7 @@ visit_GetEngineList(PyObject *self, PyObject *args)
// Allocate a tuple the with enough entries to hold the engine list.
const stringVector &engines = GetViewerState()->GetEngineList()->GetEngineName();
PyObject *retval = PyTuple_New(engines.size());
for(int i = 0; i < engines.size(); ++i)
for(size_t i = 0; i < engines.size(); ++i)
{
PyObject *name = PyString_FromString(engines[i].c_str());
if(name == NULL)
......@@ -5530,7 +5531,7 @@ visit_SetMachineProfile(PyObject *self, PyObject *args)
rmhosts.push_back(i);
}
for(int i = 0; i < rmhosts.size(); ++i)
for(size_t i = 0; i < rmhosts.size(); ++i)
hpl->RemoveMachines(rmhosts[rmhosts.size() - 1 - i]);
hpl->AddMachines(ma);
......@@ -5604,7 +5605,7 @@ visit_RemoveMachineProfile(PyObject *self, PyObject *args)
rmhosts.push_back(i);
}
for(int i = 0; i < rmhosts.size(); ++i)
for(size_t i = 0; i < rmhosts.size(); ++i)
hpl->RemoveMachines(rmhosts[rmhosts.size() - 1 - i]);
hpl->Notify();
......@@ -5640,7 +5641,7 @@ visit_GetMachineProfileNames(PyObject *self, PyObject *args)
MUTEX_UNLOCK();
PyObject *retval = PyTuple_New(names.size());
for(int i = 0; i < names.size(); ++i)
for(size_t i = 0; i < names.size(); ++i)
{
PyObject *s = PyString_FromString(names[i].c_str());
PyTuple_SET_ITEM(retval, i, s);
......@@ -6021,7 +6022,7 @@ visit_ExportDatabase(PyObject *self, PyObject *args)
const stringVector &types = dbplugininfo->GetTypes();
bool foundMatch = false;
bool hasWriter = false;
for (int i = 0 ; i < types.size() ; i++)
for (size_t i = 0 ; i < types.size() ; i++)
{
if (types[i] == db_type)
{
......@@ -6107,7 +6108,7 @@ visit_GetExportOptions(PyObject *self, PyObject *args)
const stringVector &types = dbplugininfo->GetTypes();
bool foundMatch = false;
bool hasWriter = false;
for (int i = 0 ; i < types.size() ; i++)
for (size_t i = 0 ; i < types.size() ; i++)
{
if (types[i] == plugin)
{
......@@ -6185,7 +6186,7 @@ visit_GetDefaultFileOpenOptions(PyObject *self, PyObject *args)
PyObject *dict = NULL;
const stringVector &types = foo->GetTypeNames();
bool foundMatch = false;
for (int i = 0 ; i < types.size() ; i++)
for (size_t i = 0 ; i < types.size() ; i++)
{
if (types[i] == plugin)
{
......@@ -6252,7 +6253,7 @@ visit_SetDefaultFileOpenOptions(PyObject *self, PyObject *args)
const stringVector &types = foo->GetTypeNames();
bool foundMatch = false;
for (int i = 0 ; i < types.size() ; i++)
for (size_t i = 0 ; i < types.size() ; i++)
{
if (types[i] == plugin)
{
......@@ -6312,7 +6313,7 @@ visit_GetPreferredFileFormats(PyObject *self, PyObject *args)
const stringVector &ids = foo->GetPreferredIDs();
PyObject *retval = PyTuple_New(ids.size());
for(int i = 0; i < ids.size(); ++i)
for(size_t i = 0; i < ids.size(); ++i)
{
PyObject *s = PyString_FromString(ids[i].c_str());
PyTuple_SET_ITEM(retval, i, s);
......@@ -6355,9 +6356,9 @@ visit_SetPreferredFileFormats(PyObject *self, PyObject *args)
// match names to ids if necessary
const stringVector &allnames = foo->GetTypeNames();
const stringVector &allids = foo->GetTypeIDs();
for (int i = 0 ; i < newIDs.size() ; i++)
for (size_t i = 0 ; i < newIDs.size() ; i++)
{
for (int j = 0 ; j < allnames.size() ; j++)
for (size_t j = 0 ; j < allnames.size() ; j++)
{
if (newIDs[i] == allnames[j])
{
......@@ -7335,7 +7336,7 @@ visit_ListPlots(PyObject *self, PyObject *args)
char tmpStr[2048];
size_t strLen = 0;
int j;
size_t j;
SNPRINTF(tmpStr, sizeof(tmpStr),
"Plot[%d]|id=%d;type=\"%s\";database=\"%s\";var=%s;active=%d;"
"hidden=%d;framerange=(%d, %d);keyframes={", i,
......@@ -7377,13 +7378,13 @@ visit_ListPlots(PyObject *self, PyObject *args)
strLen = strlen(tmpStr);
// Print out the plot operators.
for(j = 0; j < plot.GetNumOperators(); ++j)
for(j = 0; j < (size_t)plot.GetNumOperators(); ++j)
{
int op = plot.GetOperator(j);
SNPRINTF(&tmpStr[strLen], sizeof(tmpStr)-strLen, "\"%s\"",
GetViewerProxy()->GetOperatorPluginManager()->GetEnabledID(op).c_str());
strLen = strlen(tmpStr);
if(j < plot.GetNumOperators() - 1)
if(j < (size_t)plot.GetNumOperators() - 1)
SNPRINTF(&tmpStr[strLen], sizeof(tmpStr)-strLen, ", ");
strLen = strlen(tmpStr);
}
......@@ -7707,7 +7708,7 @@ visit_SetActivePlots(PyObject *self, PyObject *args)
bool okayToSet = false;
MUTEX_LOCK();
intVector activePlots;
for(int j = 0; j < vec.size(); ++j)
for(size_t j = 0; j < vec.size(); ++j)
{
if(vec[j] < 0 || vec[j] >= GetViewerState()->GetPlotList()->GetNumPlots())
{
......@@ -8581,7 +8582,7 @@ visit_GetOperatorOptions(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args, "i", &operatorIndex))
return NULL;
int plotIndex = 0, plotType = -1, operatorType = 0;
int plotIndex = 0, plotType = -1, operatorType = 0; (void) plotType;
PyObject *retval = 0;
MUTEX_LOCK();
PlotList plCopy(*GetViewerState()->GetPlotList());
......@@ -8601,7 +8602,7 @@ visit_GetOperatorOptions(PyObject *self, PyObject *args)
}
// Let's check that the operator index that was passed is in range.
if(operatorIndex < 0 || operatorIndex >= plCopy[plotIndex].GetOperators().size())
if(operatorIndex < 0 || (size_t)operatorIndex >= plCopy[plotIndex].GetOperators().size())
{
VisItErrorFunc("The supplied operator index was out of range.");
}
......@@ -8612,7 +8613,7 @@ visit_GetOperatorOptions(PyObject *self, PyObject *args)
const Plot &p = plCopy[plotIndex];
int opCount = 0;
operatorType = p.GetOperators()[operatorIndex];
for(int op = 0; op < p.GetOperators().size(); ++op)
for(size_t op = 0; op < p.GetOperators().size(); ++op)
{
if(p.GetOperators()[op] == operatorType)
++opCount;
......@@ -8892,7 +8893,7 @@ visit_GetQueryOutputValue(PyObject *self, PyObject *args)
else
{
PyObject *tuple = PyTuple_New(vals.size());
for(int j = 0; j < vals.size(); ++j)
for(size_t j = 0; j < vals.size(); ++j)
{
PyObject *item = PyFloat_FromDouble(vals[j]);
if(item == NULL)
......@@ -9215,7 +9216,7 @@ TurnOnOffHelper(SILCategoryRole role, bool val, const stringVector &names)
if(names.size() > 0)
{
for(int j = 0; j < names.size(); ++j)
for(size_t j = 0; j < names.size(); ++j)
{
bool nameMatched = false;
for(int k = 0; k < nsets; ++k)
......@@ -9585,7 +9586,7 @@ visit_ColorTableNames(PyObject *self, PyObject *args)
const stringVector &ctNames = GetViewerState()->GetColorTableAttributes()->GetNames();
PyObject *retval = PyTuple_New(ctNames.size());
for(int i = 0; i < ctNames.size(); ++i)
for(size_t i = 0; i < ctNames.size(); ++i)
{
PyObject *dval = PyString_FromString(ctNames[i].c_str());
if(dval == NULL)
......@@ -10045,7 +10046,7 @@ visit_Queries(PyObject *self, PyObject *args)
// We only want to include Database queries, so count them.
intVector types = GetViewerState()->GetQueryList()->GetTypes();
int nQueries = 0;
for(int i = 0; i < types.size(); ++i)
for(size_t i = 0; i < types.size(); ++i)
{
if (types[i] == QueryList::DatabaseQuery)
nQueries++;
......@@ -10054,7 +10055,7 @@ visit_Queries(PyObject *self, PyObject *args)
// Allocate a tuple with enough entries to hold the queries name list.
PyObject *retval = PyTuple_New(nQueries);
for(int j = 0, k = 0; j < queries.size(); ++j)
for(size_t j = 0, k = 0; j < queries.size(); ++j)
{
if (types[j] == QueryList::DatabaseQuery)
{
......@@ -10100,7 +10101,7 @@ visit_QueriesOverTime(PyObject *self, PyObject *args)
intVector types = GetViewerState()->GetQueryList()->GetTypes();
intVector mode = GetViewerState()->GetQueryList()->GetQueryMode();
int nQueries = 0;
for(int i = 0; i < types.size(); ++i)
for(size_t i = 0; i < types.size(); ++i)
{
if (types[i] == QueryList::DatabaseQuery &&
mode[i] != QueryList::QueryOnly )
......@@ -10110,7 +10111,7 @@ visit_QueriesOverTime(PyObject *self, PyObject *args)
// Allocate a tuple with enough entries to hold the queries name list.
PyObject *retval = PyTuple_New(nQueries);
for(int j = 0, k = 0; j < queries.size(); ++j)
for(size_t j = 0, k = 0; j < queries.size(); ++j)
{
if (types[j] == QueryList::DatabaseQuery &&
mode[j] != QueryList::QueryOnly)
......@@ -11079,7 +11080,7 @@ visit_Query_deprecated(PyObject *self, PyObject *args)
int arg1 = 0, arg2 = 0;
double darg;
doubleVector darg1(3), darg2(2), darg3(2);
bool dumpSteps = false;
//bool dumpSteps = false;
PyObject *tuple = NULL;
bool parse_success = false;
......@@ -11528,14 +11529,14 @@ visit_PythonQuery(PyObject *self, PyObject *args, PyObject *kwargs)
PyObject *py_vars_tuple = NULL;
PyObject *py_args = NULL;
static char *kwlist[] = {"source", "file", "vars","args",NULL};
static const char *kwlist[] = {"source", "file", "vars","args",NULL};
// keyword arguments
// source: string containg the python filter source
// file: string containing the location of a script file
// vars: tuple containing variable names
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssOO", kwlist,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssOO", const_cast<char**>(kwlist),
&source_text, &source_file,
&py_vars_tuple,
&py_args))
......@@ -11626,19 +11627,19 @@ visit_DefinePythonExpression(PyObject *self, PyObject *args, PyObject *kwargs)
ENSURE_VIEWER_EXISTS();
char *var_name = NULL;
char *var_type = "scalar";
const char *var_type = "scalar";
PyObject *args_tuple = NULL;
char *source_text = NULL;
char *source_file = NULL;
static char *kwlist[] = {"name","args","source", "file", "type", NULL};
static const char *kwlist[] = {"name","args","source", "file", "type", NULL};
// keyword arguments
// source: string containg the python filter source
// file: string containing the location of a script file
// vars: tuple containing variable names
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|sss", kwlist,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|sss", const_cast<char**>(kwlist),
&var_name, &args_tuple,
&source_text,
&source_file, &var_type))
......@@ -13967,7 +13968,7 @@ visit_Lineout(PyObject *self, PyObject *args, PyObject *kwargs)
bool parse_success = true;
MapNode queryParams;
PyObject *repr = NULL;
PyObject *repr = NULL; (void) repr;
if (args == NULL)
......@@ -14432,7 +14433,7 @@ visit_GetAnnotationObject(PyObject *self, PyObject *args)
const char *mName = "visit_GetAnnotationObject: ";
ENSURE_VIEWER_EXISTS();
bool useIndex = true;
//bool useIndex = true;
char *annotName = NULL;
if(!PyArg_ParseTuple(args, "s", &annotName))
......@@ -14998,7 +14999,7 @@ visit_LoadNamedSelection(PyObject *self, PyObject *args)
{
const stringVector &engines = GetViewerState()->GetEngineList()->GetEngineName();
const stringVector &sims = GetViewerState()->GetEngineList()->GetSimulationName();
for (int i=0; i<engines.size(); i++)
for (size_t i=0; i<engines.size(); i++)
{
if (engines[i] == engineName)
{
......@@ -15041,8 +15042,8 @@ visit_SaveNamedSelection(PyObject *self, PyObject *args)
ENSURE_VIEWER_EXISTS();
char *selName;
bool useFirstEngine = false;
bool useFirstSimulation = false;
//bool useFirstEngine = false;
//bool useFirstSimulation = false;
const char *engineName = 0;
const char *simulationName = 0;
......@@ -15474,7 +15475,7 @@ visit_ClientMethod(PyObject *self, PyObject *args)
ENSURE_VIEWER_EXISTS();
char *name = 0;
char *arg1 = 0;
//char *arg1 = 0;
const char *CMError = "The tuple passed as the arguments to the"
"client method must contain only int, long, "
" float, tuples, or lists.";
......@@ -15602,7 +15603,7 @@ visit_ExecuteMacro(PyObject *self, PyObject *args)
ENSURE_VIEWER_EXISTS();
char *name = 0;
PyObject *obj = 0;
//PyObject *obj = 0;
if (!PyArg_ParseTuple(args, "s", &name))
return NULL;
......@@ -15757,7 +15758,7 @@ visit_GetCallbackNames(PyObject *, PyObject *args)
// Allocate a tuple the with enough entries to hold the plugin name list.
PyObject *retval = PyTuple_New(names.size());
for(int i = 0; i < names.size(); ++i)
for(size_t i = 0; i < names.size(); ++i)
{
PyObject *dval = PyString_FromString(names[i].c_str());
if(dval == NULL)
......@@ -15796,7 +15797,7 @@ visit_GetCallbackArgumentCount(PyObject *, PyObject *args)
callbackMgr->GetCallbackNames(names);
bool failed = true;
int retval = 0;
for(int i = 0; i < names.size(); ++i)
for(size_t i = 0; i < names.size(); ++i)
{
if(names[i] == name)
{
......@@ -15896,7 +15897,7 @@ visit_RegisterCallback(PyObject *, PyObject *args)
stringVector names;
callbackMgr->GetCallbackNames(names);
failed = true;
for(int i = 0; i < names.size(); ++i)
for(size_t i = 0; i < names.size(); ++i)
{
if(names[i] == name)
{
......@@ -17826,7 +17827,7 @@ NeedToLoadPlugins(Subject *, void *)
static int
InitializeModule()
{
bool ret = false;
bool ret = false; (void) ret;
// Register a close-down function to close the viewer.
Py_AtExit(terminatevisit);
......@@ -18019,7 +18020,7 @@ ReadVisItPluginDir(const char *visitProgram)
while(!feof(p))
{
fgets(line, 2000, p);
char* res = fgets(line, 2000, p); (void) res;
if(strncmp(line, vpd, vpdLen) == 0)
{
char *value = NULL, *end = NULL;
......@@ -18568,9 +18569,9 @@ void initvisitmodule()
void
initvisit()
{
int initCode = 0;
int initCode = 0; (void) initCode;
PyObject *main_module = NULL;
PyObject *gdict = NULL;
PyObject *gdict = NULL; (void) gdict;
PyEval_InitThreads();
// save a pointer to the main PyThreadState object
mainThreadState = PyThreadState_Get();
......
......@@ -68,10 +68,11 @@ IF(VISIT_PARALLEL)
"${MPICOM_PY_SOURCES}"
${MPICOM_SOURCES})
SET_TARGET_PROPERTIES(mpicom PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
IF(UNIX)
IF(VISIT_PARALLEL_CXXFLAGS)
SET(PAR_COMPILE_FLAGS "")
SET(PAR_COMPILE_FLAGS "-fno-strict-aliasing")
FOREACH (X ${VISIT_PARALLEL_CXXFLAGS})
SET(PAR_COMPILE_FLAGS "${PAR_COMPILE_FLAGS} ${X}")
ENDFOREACH (X ${VISIT_PARALLEL_CXXFLAGS})
......
......@@ -217,7 +217,7 @@ Buffer::Init(int buffer_size)
Reset();
// Any buffer size smaller than the header is invalid.
if(buffer_size >= (2 * sizeof(int) ))
if((size_t)buffer_size >= (2 * sizeof(int) ))
{
this->size = buffer_size;
buffer = (void*) new char[this->size];
......
......@@ -797,7 +797,7 @@ mpicom_gather(PyObject *self, PyObject *args)
return NULL;
}
int rcv_idx = 0;
//int rcv_idx = 0;
for(int i=0;i<nprocs;i++)
{
Buffer obj_buff((void*)&rcv_buffer[rcv_displacements[i]]);
......@@ -1023,7 +1023,7 @@ mpicom_alltoall(PyObject *self, PyObject *args)
}
PyObject *res= NULL;
//PyObject *res= NULL;
if(PySequence_Check(py_obj) == 0)
{
......
......@@ -123,7 +123,7 @@ int QvisGUIApplicationDerived::GetPlotWindowSize()
QMainWindow* QvisGUIApplicationDerived::GetPlotWindow(int index)
{
if(index >= plotWindows.size() || index < 0)
if(index >= (int)plotWindows.size() || index < 0)
return NULL;
ActivatePlotWindow(index);
......@@ -157,7 +157,7 @@ int QvisGUIApplicationDerived::GetOperatorWindowSize() {
QMainWindow* QvisGUIApplicationDerived::GetOperatorWindow(int index)
{
if(index >= operatorWindows.size() || index < 0)
if(index >= (int)operatorWindows.size() || index < 0)
return NULL;
ActivateOperatorWindow(index);
......
......@@ -523,7 +523,7 @@ PyAnimationAttributes_GetLogString()
static void
PyAnimationAttributes_CallLogRoutine(Subject *subj, void *data)
{
AnimationAttributes *atts = (AnimationAttributes *)subj;
AnimationAttributes *atts = (AnimationAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -1409,7 +1409,7 @@ PyAnnotationAttributes_GetLogString()
static void
PyAnnotationAttributes_CallLogRoutine(Subject *subj, void *data)
{
AnnotationAttributes *atts = (AnnotationAttributes *)subj;
AnnotationAttributes *atts = (AnnotationAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -670,7 +670,7 @@ PyAxes2D_GetLogString()
static void
PyAxes2D_CallLogRoutine(Subject *subj, void *data)
{
Axes2D *atts = (Axes2D *)subj;
Axes2D *atts = (Axes2D *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -899,7 +899,7 @@ PyAxes3D_GetLogString()
static void
PyAxes3D_CallLogRoutine(Subject *subj, void *data)
{
Axes3D *atts = (Axes3D *)subj;
Axes3D *atts = (Axes3D *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -514,7 +514,7 @@ PyAxesArray_GetLogString()
static void
PyAxesArray_CallLogRoutine(Subject *subj, void *data)
{
AxesArray *atts = (AxesArray *)subj;
AxesArray *atts = (AxesArray *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -473,7 +473,7 @@ PyAxisAttributes_GetLogString()
static void
PyAxisAttributes_CallLogRoutine(Subject *subj, void *data)
{
AxisAttributes *atts = (AxisAttributes *)subj;
AxisAttributes *atts = (AxisAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -409,7 +409,7 @@ PyAxisLabels_GetLogString()
static void
PyAxisLabels_CallLogRoutine(Subject *subj, void *data)
{
AxisLabels *atts = (AxisLabels *)subj;
AxisLabels *atts = (AxisLabels *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -457,7 +457,7 @@ PyAxisTickMarks_GetLogString()
static void
PyAxisTickMarks_CallLogRoutine(Subject *subj, void *data)
{
AxisTickMarks *atts = (AxisTickMarks *)subj;
AxisTickMarks *atts = (AxisTickMarks *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -511,7 +511,7 @@ PyAxisTitles_GetLogString()
static void
PyAxisTitles_CallLogRoutine(Subject *subj, void *data)
{
AxisTitles *atts = (AxisTitles *)subj;