Commit f9d0363e authored by bonnell's avatar bonnell

Add a warning-removal change from Hari to the python generator, regenerate...

Add a warning-removal change from Hari to the python generator, regenerate some python state objects

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23650 18c085ea-50e0-402c-830e-de6fd14e8384
parent e5601020
......@@ -2137,7 +2137,7 @@ class AttsGeneratorAttVector : public virtual AttVector , public virtual PythonG
c << " int index;" << Endl;
c << " if(!PyArg_ParseTuple(args, \"i\", &index))" << Endl;
c << " return NULL;" << Endl;
c << " if(index < 0 || index >= obj->data->Get" << Name << "().size())" << Endl;
c << " if(index < 0 || (size_t)index >= obj->data->Get" << Name << "().size())" << Endl;
c << " {" << Endl;
c << " char msg[200];" << Endl;
c << " if(obj->data->Get" << Name << "().size() == 0)" << Endl;
......@@ -3168,7 +3168,7 @@ class PythonGeneratorAttribute : public GeneratorBase
c << "std::string" << Endl;
c << mName << "(const "<<name<<" *atts, const char *prefix)" << Endl;
c << "{" << Endl;
c << " std::string str; " << Endl;
c << " std::string str;" << Endl;
c << " char tmpStr[1000]; (void)tmpStr;" << Endl;
c << Endl;
if (custombase)
......@@ -3372,7 +3372,7 @@ class PythonGeneratorAttribute : public GeneratorBase
c << "static void" << Endl;
c << CallLogRoutine << "(Subject *subj, void *data)" << Endl;
c << "{" << Endl;
c << " "<<name<<" *atts = ("<<name<<" *)subj; (void) atts; " << Endl;
c << " "<<name<<" *atts = ("<<name<<" *)subj; (void) atts;" << Endl;
if(HasCode(CallLogRoutine, 0))
PrintCode(c, CallLogRoutine, 0);
c << " typedef void (*logCallback)(const std::string &);" << Endl;
......
......@@ -73,8 +73,8 @@ static PyObject *NewAnimationAttributes(int);
std::string
PyAnimationAttributes_ToString(const AnimationAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
const char *animationMode_names = "ReversePlayMode, StopMode, PlayMode";
switch (atts->GetAnimationMode())
......
......@@ -82,8 +82,8 @@ static PyObject *NewAnnotationAttributes(int);
std::string
PyAnnotationAttributes_ToString(const AnnotationAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
std::string objPrefix(prefix);
......
......@@ -75,8 +75,8 @@ static PyObject *NewAxes2D(int);
std::string
PyAxes2D_ToString(const Axes2D *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -76,8 +76,8 @@ static PyObject *NewAxes3D(int);
std::string
PyAxes3D_ToString(const Axes3D *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewAxesArray(int);
std::string
PyAxesArray_ToString(const AxesArray *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -76,8 +76,8 @@ static PyObject *NewAxisAttributes(int);
std::string
PyAxisAttributes_ToString(const AxisAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
std::string objPrefix(prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewAxisLabels(int);
std::string
PyAxisLabels_ToString(const AxisLabels *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewAxisTickMarks(int);
std::string
PyAxisTickMarks_ToString(const AxisTickMarks *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewAxisTitles(int);
std::string
PyAxisTitles_ToString(const AxisTitles *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetVisible())
SNPRINTF(tmpStr, 1000, "%svisible = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewColorAttribute(int);
std::string
PyColorAttribute_ToString(const ColorAttribute *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const unsigned char *color = atts->GetColor();
SNPRINTF(tmpStr, 1000, "%scolor = (", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewColorAttributeList(int);
std::string
PyColorAttributeList_ToString(const ColorAttributeList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
int index = 0;
......
......@@ -73,8 +73,8 @@ static PyObject *NewColorControlPoint(int);
std::string
PyColorControlPoint_ToString(const ColorControlPoint *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const unsigned char *colors = atts->GetColors();
SNPRINTF(tmpStr, 1000, "%scolors = (", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewColorControlPointList(int);
std::string
PyColorControlPointList_ToString(const ColorControlPointList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
int index = 0;
......
......@@ -74,8 +74,8 @@ static PyObject *NewColorTableAttributes(int);
std::string
PyColorTableAttributes_ToString(const ColorTableAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const stringVector &names = atts->GetNames();
SNPRINTF(tmpStr, 1000, "%snames = (", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewConstructDataBinningAttributes(int);
std::string
PyConstructDataBinningAttributes_ToString(const ConstructDataBinningAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewDBOptionsAttributes(int);
std::string
PyDBOptionsAttributes_ToString(const DBOptionsAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const intVector &types = atts->GetTypes();
SNPRINTF(tmpStr, 1000, "%stypes = (", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewExpression(int);
std::string
PyExpression_ToString(const Expression *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewExpressionList(int);
std::string
PyExpressionList_ToString(const ExpressionList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
int index = 0;
......
......@@ -74,8 +74,8 @@ static PyObject *NewFileOpenOptions(int);
std::string
PyFileOpenOptions_ToString(const FileOpenOptions *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const stringVector &typeNames = atts->GetTypeNames();
SNPRINTF(tmpStr, 1000, "%stypeNames = (", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewFontAttributes(int);
std::string
PyFontAttributes_ToString(const FontAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
const char *font_names = "Arial, Courier, Times";
switch (atts->GetFont())
......
......@@ -73,8 +73,8 @@ static PyObject *NewGaussianControlPoint(int);
std::string
PyGaussianControlPoint_ToString(const GaussianControlPoint *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sx = %g\n", prefix, atts->GetX());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewGaussianControlPointList(int);
std::string
PyGaussianControlPointList_ToString(const GaussianControlPointList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
int index = 0;
......
......@@ -73,8 +73,8 @@ static PyObject *NewGlobalAttributes(int);
std::string
PyGlobalAttributes_ToString(const GlobalAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const stringVector &sources = atts->GetSources();
SNPRINTF(tmpStr, 1000, "%ssources = (", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewGlobalLineoutAttributes(int);
std::string
PyGlobalLineoutAttributes_ToString(const GlobalLineoutAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetDynamic())
SNPRINTF(tmpStr, 1000, "%sDynamic = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewInteractorAttributes(int);
std::string
PyInteractorAttributes_ToString(const InteractorAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetShowGuidelines())
SNPRINTF(tmpStr, 1000, "%sshowGuidelines = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewKeyframeAttributes(int);
std::string
PyKeyframeAttributes_ToString(const KeyframeAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetEnabled())
SNPRINTF(tmpStr, 1000, "%senabled = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewLaunchProfile(int);
std::string
PyLaunchProfile_ToString(const LaunchProfile *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sprofileName = \"%s\"\n", prefix, atts->GetProfileName().c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewLightAttributes(int);
std::string
PyLightAttributes_ToString(const LightAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetEnabledFlag())
SNPRINTF(tmpStr, 1000, "%senabledFlag = 1\n", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewMachineProfile(int);
std::string
PyMachineProfile_ToString(const MachineProfile *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%shost = \"%s\"\n", prefix, atts->GetHost().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewMaterialAttributes(int);
std::string
PyMaterialAttributes_ToString(const MaterialAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetSmoothing())
SNPRINTF(tmpStr, 1000, "%ssmoothing = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewMeshManagementAttributes(int);
std::string
PyMeshManagementAttributes_ToString(const MeshManagementAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const doubleVector &discretizationTolerance = atts->GetDiscretizationTolerance();
SNPRINTF(tmpStr, 1000, "%sdiscretizationTolerance = (", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewNameschemeAttributes(int);
std::string
PyNameschemeAttributes_ToString(const NameschemeAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%snamescheme = \"%s\"\n", prefix, atts->GetNamescheme().c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewPickAttributes(int);
std::string
PyPickAttributes_ToString(const PickAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const stringVector &variables = atts->GetVariables();
SNPRINTF(tmpStr, 1000, "%svariables = (", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewPickVarInfo(int);
std::string
PyPickVarInfo_ToString(const PickVarInfo *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%svariableName = \"%s\"\n", prefix, atts->GetVariableName().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewPlot(int);
std::string
PyPlot_ToString(const Plot *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
const char *stateType_names = "NewlyCreated, Pending, Completed, Error";
switch (atts->GetStateType())
......
......@@ -74,8 +74,8 @@ static PyObject *NewPlotList(int);
std::string
PyPlotList_ToString(const PlotList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
int index = 0;
......
......@@ -73,8 +73,8 @@ static PyObject *NewPrinterAttributes(int);
std::string
PyPrinterAttributes_ToString(const PrinterAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sprinterName = \"%s\"\n", prefix, atts->GetPrinterName().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewProcessAttributes(int);
std::string
PyProcessAttributes_ToString(const ProcessAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const intVector &pids = atts->GetPids();
SNPRINTF(tmpStr, 1000, "%spids = (", prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewRenderingAttributes(int);
std::string
PyRenderingAttributes_ToString(const RenderingAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetAntialiasing())
SNPRINTF(tmpStr, 1000, "%santialiasing = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewSaveSubWindowAttributes(int);
std::string
PySaveSubWindowAttributes_ToString(const SaveSubWindowAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ const int *position = atts->GetPosition();
SNPRINTF(tmpStr, 1000, "%sposition = (", prefix);
......
......@@ -89,8 +89,8 @@ static PyObject *NewSaveSubWindowsAttributes(int);
std::string
PySaveSubWindowsAttributes_ToString(const SaveSubWindowsAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000]; (void) tmpStr;
std::string str;
char tmpStr[1000]; (void)tmpStr;
{ // new scope
std::string objPrefix(prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewSaveWindowAttributes(int);
std::string
PySaveWindowAttributes_ToString(const SaveWindowAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetOutputToCurrentDirectory())
SNPRINTF(tmpStr, 1000, "%soutputToCurrentDirectory = 1\n", prefix);
......
......@@ -75,8 +75,8 @@ static PyObject *NewSelectionList(int);
std::string
PySelectionList_ToString(const SelectionList *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetAutoApplyUpdates())
SNPRINTF(tmpStr, 1000, "%sautoApplyUpdates = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewSelectionProperties(int);
std::string
PySelectionProperties_ToString(const SelectionProperties *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewSelectionSummary(int);
std::string
PySelectionSummary_ToString(const SelectionSummary *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewSelectionVariableSummary(int);
std::string
PySelectionVariableSummary_ToString(const SelectionVariableSummary *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewSimulationUIValues(int);
std::string
PySimulationUIValues_ToString(const SimulationUIValues *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%shost = \"%s\"\n", prefix, atts->GetHost().c_str());
str += tmpStr;
......@@ -489,7 +489,7 @@ PySimulationUIValues_GetLogString()
static void
PySimulationUIValues_CallLogRoutine(Subject *subj, void *data)
{
SimulationUIValues *atts = (SimulationUIValues *)subj;
SimulationUIValues *atts = (SimulationUIValues *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -73,8 +73,8 @@ static PyObject *NewThresholdOpAttributes(int);
std::string
PyThresholdOpAttributes_ToString(const ThresholdOpAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%soutputMeshType = %d\n", prefix, atts->GetOutputMeshType());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewView2DAttributes(int);
std::string
PyView2DAttributes_ToString(const View2DAttributes *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;