Commit 2ed1f5c6 authored by loring's avatar loring

clean up some warnings


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27504 18c085ea-50e0-402c-830e-de6fd14e8384
parent e2c77b10
......@@ -581,10 +581,13 @@ CConvertUnstructuredGridToPolyData(avtDataRepresentation &data, void *dataAndKey
// Tom Fogal, Tue Sep 27 14:07:30 MDT 2011
// Ensure static vtk memory gets cleaned up.
//
// Burlen Loring, Fri Oct 2 17:02:27 PDT 2015
// clean up a warning
//
// ****************************************************************************
void
CBreakVTKPipelineConnections(avtDataRepresentation &data, void *arg, bool &)
CBreakVTKPipelineConnections(avtDataRepresentation &data, void *, bool &)
{
if (!data.Valid())
{
......@@ -2049,6 +2052,9 @@ GetDataMagnitudeRange(vtkDataSet *ds, double *exts, const char *vname,
// Added 'GetNodalMajorEigenalueRangeViaCells' to be used when data is nodal
// and 'onlyConnectedNodes' is requested.
//
// Burlen Loring, Fri Oct 2 17:02:27 PDT 2015
// clean up a warning
//
// ****************************************************************************
template <class T> static double
......@@ -2106,6 +2112,7 @@ template <class T> static void
GetNodalMajorEigenvalueRangeViaCells(T *ptr, int n, int ncomps, double *exts,
vtkDataSet *ds)
{
(void)n;
vtkIdType nCells = ds->GetNumberOfCells();
vtkIdList *ptIds = vtkIdList::New();
for (vtkIdType cellId = 0; cellId < nCells; ++cellId)
......
......@@ -112,6 +112,9 @@ class avtTransparencyActor;
// Brad Whitlock, Wed Aug 22 11:27:17 PDT 2007
// Added reduced detail methods.
//
// Burlen Loring, Mon Sep 28 08:54:40 PDT 2015
// Clean up two warnings
//
// ****************************************************************************
class PLOTTER_API avtDrawable
......@@ -137,8 +140,8 @@ class PLOTTER_API avtDrawable
virtual void TurnLightingOff(void) = 0;
virtual void SetAmbientCoefficient(const double) = 0;
virtual void SetSurfaceRepresentation(int rep) {;};
virtual void SetImmediateModeRendering(bool val) {;};
virtual void SetSurfaceRepresentation(int) {;};
virtual void SetImmediateModeRendering(bool) {;};
virtual void SetSpecularProperties(bool,double,double,
const ColorAttribute&) {;}
......
......@@ -138,6 +138,9 @@ class avtExpressionEvaluatorFilter;
// Add GetNFilters, since that will get the number of stages more accurate
// for queries over time.
//
// Burlen Loring, Thu Oct 8 12:46:02 PDT 2015
// Fix a couple of warnings
//
// ****************************************************************************
class QUERY_API avtPickQuery : public avtDatasetQuery
......@@ -161,8 +164,8 @@ class QUERY_API avtPickQuery : public avtDatasetQuery
void SetPickAtts(const PickAttributes *pa);
void SetPickAttsForTimeQuery(const PickAttributes *pa);
const PickAttributes * GetPickAtts(void);
virtual void SetTransform(const avtMatrix *m){};
virtual void SetInvTransform(const avtMatrix *m){};
virtual void SetTransform(const avtMatrix *){};
virtual void SetInvTransform(const avtMatrix *){};
void SetNeedTransform(const bool b)
{ needTransform = b; };
void SetSkippedLocate(const bool s)
......
......@@ -134,6 +134,9 @@ class ExpressionList;
// Brad Whitlock, Wed Sep 17 12:22:21 PDT 2014
// Added common base class for viewer/engine plugins.
//
// Burlen Loring, Thu Oct 8 14:31:15 PDT 2015
// clean up a few compiler warnings
//
// ****************************************************************************
class PLUGIN_API GeneralOperatorPluginInfo
......@@ -153,7 +156,7 @@ class PLUGIN_API CommonOperatorPluginInfo : public virtual GeneralOperatorPlugin
virtual AttributeSubject *AllocAttributes() = 0;
virtual void CopyAttributes(AttributeSubject *to,
AttributeSubject *from) = 0;
virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *md) {return NULL;}
virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *) {return NULL;}
virtual bool GetUserSelectable() const { return true; }
virtual int GetVariableTypes() const { return 0; }
virtual int GetVariableMask() const { return ~0; }
......@@ -166,8 +169,8 @@ class PLUGIN_API GUIOperatorPluginInfo : public virtual CommonOperatorPluginInfo
virtual QvisPostableWindowObserver *CreatePluginWindow(int type,
AttributeSubject *attr, const QString &caption, const QString &shortName,
QvisNotepadArea *notepad) = 0;
virtual QvisWizard *CreatePluginWizard(AttributeSubject *attr,
QWidget *parent, const char *name =0)
virtual QvisWizard *CreatePluginWizard(AttributeSubject *,
QWidget *, const char * = 0)
{
return 0;
}
......@@ -182,19 +185,16 @@ class PLUGIN_API ViewerEngineOperatorPluginInfo : public virtual CommonOperatorP
virtual void SetClientAtts(AttributeSubject *atts) = 0;
virtual void GetClientAtts(AttributeSubject *atts) = 0;
virtual void GetClientAtts(AttributeSubject *atts,
const bool activeOperator,
const bool applyToAll)
{
GetClientAtts(atts);
};
const bool, const bool)
{ GetClientAtts(atts); };
virtual void InitializeOperatorAtts(AttributeSubject *atts,
const avtPlotMetaData &plot,
const bool fromDefault) = 0;
virtual void UpdateOperatorAtts(AttributeSubject *atts,
const avtPlotMetaData &plot) = 0;
virtual std::string GetOperatorVarDescription(AttributeSubject *atts,
const avtPlotMetaData &plot)
virtual std::string GetOperatorVarDescription(AttributeSubject *,
const avtPlotMetaData &)
{ return std::string(); }
virtual const char *GetMenuName() const = 0;
......@@ -221,7 +221,7 @@ class PLUGIN_API ScriptingOperatorPluginInfo : public virtual CommonOperatorPlug
virtual void InitializePlugin(AttributeSubject *subj, void *data) = 0;
virtual void *GetMethodTable(int *nMethods) = 0;
virtual char *GetLogString() = 0;
virtual bool TypesMatch(void *pyobject) { return false; }
virtual bool TypesMatch(void *) { return false; }
virtual void SetDefaults(const AttributeSubject *) = 0;
};
......
......@@ -146,6 +146,9 @@ class ViewerPlot;
// Kathleen Bonnell, Mon Mar 2 16:25:53 PST 2009
// Added PermitsCurveViewScaling, Permits2DViewScaling.
//
// Burlen Loring, Thu Oct 8 14:34:36 PDT 2015
// fix a couple of compiler warnings
//
// ****************************************************************************
class PLUGIN_API GeneralPlotPluginInfo
......@@ -174,9 +177,9 @@ class PLUGIN_API GUIPlotPluginInfo : public virtual CommonPlotPluginInfo
virtual QvisPostableWindowObserver *CreatePluginWindow(int type,
AttributeSubject *attr, const QString &caption, const QString &shortName,
QvisNotepadArea *notepad) = 0;
virtual QvisWizard *CreatePluginWizard(AttributeSubject *attr, QWidget *parent,
const std::string &varName, const avtDatabaseMetaData *md,
const ExpressionList *expList)
virtual QvisWizard *CreatePluginWizard(AttributeSubject *, QWidget *,
const std::string &, const avtDatabaseMetaData *,
const ExpressionList *)
{
return 0;
}
......@@ -199,10 +202,10 @@ public:
virtual void InitializePlotAtts(AttributeSubject *atts,
const avtPlotMetaData &) = 0;
virtual void ReInitializePlotAtts(AttributeSubject *atts,
virtual void ReInitializePlotAtts(AttributeSubject *,
const avtPlotMetaData &) { ; }
virtual void ResetPlotAtts(AttributeSubject *atts,
virtual void ResetPlotAtts(AttributeSubject *,
const avtPlotMetaData &) { ; }
virtual const char *GetMenuName() const = 0;
......@@ -214,12 +217,12 @@ public:
virtual const char **XPMIconData() const { return 0; }
virtual void *AlternateDisplayCreate(ViewerPlot *) { return 0; }
virtual void AlternateDisplayDestroy(void *dpy) {; }
virtual void AlternateDisplayClear(void *dpy) {; }
virtual void AlternateDisplayHide(void *dpy) {; }
virtual void AlternateDisplayShow(void *dpy) {; }
virtual void AlternateDisplayIconify(void *dpy) {; }
virtual void AlternateDisplayDeIconify(void *dpy) {; }
virtual void AlternateDisplayDestroy(void *) {; }
virtual void AlternateDisplayClear(void *) {; }
virtual void AlternateDisplayHide(void *) {; }
virtual void AlternateDisplayShow(void *) {; }
virtual void AlternateDisplayIconify(void *) {; }
virtual void AlternateDisplayDeIconify(void *) {; }
};
class PLUGIN_API EnginePlotPluginInfo : public virtual ViewerEnginePlotPluginInfo
......
......@@ -70,6 +70,9 @@
// Added virtual method TypeName so that derived classes can have their
// names printed in log files.
//
// Burlen Loring, Thu Sep 24 11:35:22 PDT 2015
// I removed a compiler warning.
//
// ****************************************************************************
class STATE_API AttributeSubject : public AttributeGroup, public Subject
......@@ -81,7 +84,7 @@ public:
virtual const std::string TypeName() const;
virtual void Notify();
virtual AttributeSubject *CreateCompatible(const std::string &) const;
virtual AttributeSubject *NewInstance(bool copy) const { return 0; };
virtual AttributeSubject *NewInstance(bool) const { return 0; };
virtual bool VarChangeRequiresReset(void) { return false; };
};
......
......@@ -146,13 +146,17 @@ EngineRPCExecutor<QuitRPC>::Execute(QuitRPC *rpc)
// Creation: Fri Mar 12 11:36:11 PDT 2004
//
// Modifications:
//
//
// Burlen Loring, Fri Oct 16 13:35:24 PDT 2015
// Fix a warning
//
// ****************************************************************************
template<>
void
EngineRPCExecutor<KeepAliveRPC>::Execute(KeepAliveRPC *rpc)
{
(void) rpc;
//
// Now send back some data on the command and data sockets.
//
......
......@@ -5944,9 +5944,12 @@ ViewerPlot::GetEngineKey() const
// Kathleen Biagas, Wed Feb 29 14:08:13 MST 2012
// Wrapped in a Try-catch block.
//
// Burlen Loring, Wed Aug 26 14:05:24 PDT 2015
// fix a compiler warning
//
// ****************************************************************************
const avtCentering
avtCentering
ViewerPlot::GetVariableCentering() const
{
avtCentering retval = AVT_UNKNOWN_CENT;
......
......@@ -306,6 +306,9 @@ class avtToolInterface;
// Kathleen Biagas, Wed Feb 29 07:46:10 MST 2012
// Added GetExtraInfoForPick.
//
// Burlen Loring, Wed Aug 26 14:04:16 PDT 2015
// clean up a compiler warning
//
// ****************************************************************************
class VIEWERCORE_API ViewerPlot : public ViewerBase
......@@ -359,7 +362,7 @@ public:
void SetVariableDescription(const std::string &);
void UpdateVariableDescription( bool resest = false );
const std::string &GetVariableDescription() const;
const avtCentering GetVariableCentering() const;
avtCentering GetVariableCentering() const;
const std::string &GetMeshName() const;
const std::string &GetPlotDescription() const;
void SetPlotDescription(const std::string &);
......
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