Commit 0625aaeb authored by Sean McBride's avatar Sean McBride
Browse files

COMP: fixed more clang warnings

parent ec1b2a70
......@@ -599,6 +599,11 @@ void TestVoidReturnOuter()
# pragma warning (disable:858) // type qualifier on return is meaningless
#endif
// clang warns about type qualifiers on return types.
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wignored-qualifiers"
#endif
// aCC warns "type qualifier on return type is meaningless" - just omit the
// function on aCC builds since there is no way to suppress the warning via
......@@ -608,6 +613,9 @@ void TestVoidReturnOuter()
void const TestVoidConstReturn() {}
#endif
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#if defined(__INTEL_COMPILER)
# pragma warning (pop)
......
......@@ -69,10 +69,10 @@ void vtkCompositer::SetController(vtkMultiProcessController *mpc)
void vtkCompositer::CompositeBuffer(vtkDataArray *pBuf, vtkFloatArray *zBuf,
vtkDataArray *pTmp, vtkFloatArray *zTmp)
{
pBuf = pBuf;
zBuf = zBuf;
pTmp = pTmp;
zTmp = zTmp;
(void)pBuf;
(void)zBuf;
(void)pTmp;
(void)zTmp;
}
//-------------------------------------------------------------------------
......
......@@ -67,14 +67,13 @@ public:
//----------------------------------------------------------------------------
// An RMI function that will break the "ProcessRMIs" loop.
void vtkMultiProcessControllerBreakRMI(void *localArg,
void *remoteArg, int remoteArgLength,
void vtkMultiProcessControllerBreakRMI(void *localArg,
void *remoteArg, int remoteArgLength,
int vtkNotUsed(remoteId))
{
vtkMultiProcessController *controller;
remoteArg = remoteArg;
remoteArgLength = remoteArgLength;
controller = (vtkMultiProcessController*)(localArg);
(void)remoteArg;
(void)remoteArgLength;
vtkMultiProcessController *controller = (vtkMultiProcessController*)(localArg);
controller->SetBreakFlag(1);
}
......
......@@ -201,7 +201,7 @@ public:
// Description:
// Take an RMI away.
void RemoveRMI(vtkRMIFunctionType f, void *arg, int tag)
{f = f; arg = arg; tag = tag; vtkErrorMacro("RemoveRMI Not Implemented Yet");};
{(void)f; (void)arg; (void)tag; vtkErrorMacro("RemoveRMI Not Implemented Yet");};
// Description:
// These methods are a part of the newer API to add multiple rmi callbacks.
......
......@@ -691,5 +691,9 @@ void GridExchange::exchange(int sendTo, int recvFrom, GRID_T* data)
}
}
}
#else
(void)sendTo;
(void)recvFrom;
(void)data;
#endif
}
Supports Markdown
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