Commit c2fa863e authored by Sean McBride's avatar Sean McBride
Browse files

Made some private functions static

Fixes -Wmissing-prototypes warnings.

Change-Id: I577917ab639f522849731dd5023b2b3f6557387a
parent a550d83b
......@@ -38,7 +38,7 @@ int TestCollection(int,char *[])
return res ? EXIT_SUCCESS : EXIT_FAILURE;
}
bool IsEqual(vtkCollection* collection, const std::vector<vtkSmartPointer<vtkIntArray> >& v)
static bool IsEqual(vtkCollection* collection, const std::vector<vtkSmartPointer<vtkIntArray> >& v)
{
if (collection->GetNumberOfItems() != static_cast<int>(v.size()))
{
......
......@@ -69,7 +69,7 @@ private:
// A callback that reports when it is called.
static int called = 0;
void MyDeleteCallback(vtkObject*, unsigned long, void*, void*)
static void MyDeleteCallback(vtkObject*, unsigned long, void*, void*)
{
called = 1;
}
......
......@@ -56,7 +56,7 @@ vtkDirectedAcyclicGraph *vtkDirectedAcyclicGraph::GetData(vtkInformationVector *
enum { DFS_WHITE, DFS_GRAY, DFS_BLACK };
//----------------------------------------------------------------------------
bool vtkDirectedAcyclicGraphDFSVisit(
static bool vtkDirectedAcyclicGraphDFSVisit(
vtkGraph *g,
vtkIdType u,
vtksys_stl::vector<int> color,
......
......@@ -15,7 +15,7 @@
#include "vtkUnstructuredGridReader.h"
#include "vtkFieldData.h"
int DumpQualityStats( vtkMeshQuality* iq, const char *arrayname )
static int DumpQualityStats( vtkMeshQuality* iq, const char *arrayname )
{
cout << " cardinality: "
<< iq->GetOutput()->GetFieldData()->GetArray( arrayname )->GetComponent( 0, 4 )
......
......@@ -170,7 +170,7 @@ class vtkMPASReader::Internal {
// Function to check if there is a NetCDF variable by that name
//-----------------------------------------------------------------------------
bool isNcVar(NcFile *ncFile, NcToken name)
static bool isNcVar(NcFile *ncFile, NcToken name)
{
int num_vars = ncFile->num_vars();
for (int i = 0; i < num_vars; i++)
......@@ -190,7 +190,7 @@ bool isNcVar(NcFile *ncFile, NcToken name)
// Check if there is a NetCDF dimension by that name
//----------------------------------------------------------------------------
bool isNcDim(NcFile *ncFile, NcToken name)
static bool isNcDim(NcFile *ncFile, NcToken name)
{
int num_dims = ncFile->num_dims();
//cerr << "looking for: " << name << endl;
......@@ -213,7 +213,7 @@ bool isNcDim(NcFile *ncFile, NcToken name)
// computing points in different layers of multilayer spherical view
//----------------------------------------------------------------------------
int CartesianToSpherical(double x, double y, double z, double* rho,
static int CartesianToSpherical(double x, double y, double z, double* rho,
double* phi, double* theta)
{
double trho, ttheta, tphi;
......@@ -238,7 +238,7 @@ int CartesianToSpherical(double x, double y, double z, double* rho,
// computing points in different layers of multilayer spherical view
//----------------------------------------------------------------------------
int SphericalToCartesian(double rho, double phi, double theta, double* x,
static int SphericalToCartesian(double rho, double phi, double theta, double* x,
double* y, double* z)
{
double tx, ty, tz;
......
......@@ -1034,7 +1034,7 @@ Entry:
elem - element for which we want to save away other properties
******************************************************************************/
void setup_other_props(PlyFile *, PlyElement *elem)
static void setup_other_props(PlyFile *, PlyElement *elem)
{
int i;
PlyProperty *prop;
......
......@@ -199,9 +199,9 @@ int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
}
//----------------------------------------------------------------------------
int vtkXMLWriterWriteBinaryDataBlocks(
vtkXMLWriter* writer, vtkArrayIteratorTemplate<vtkStdString>* iter,
int wordType, size_t outWordSize, size_t numStrings, int)
static int vtkXMLWriterWriteBinaryDataBlocks(
vtkXMLWriter* writer, vtkArrayIteratorTemplate<vtkStdString>* iter,
int wordType, size_t outWordSize, size_t numStrings, int)
{
vtkXMLWriterHelper::SetProgressPartial(writer, 0);
vtkStdString::value_type* allocated_buffer = 0;
......
......@@ -286,7 +286,7 @@ void vtkImageThresholdConnectivityValues(
}
//----------------------------------------------------------------------------
void vtkImageThresholdConnectivityApplyStencil(
static void vtkImageThresholdConnectivityApplyStencil(
vtkImageData *maskData, vtkImageStencilData *stencil, int extent[6])
{
vtkImageStencilIterator<unsigned char> iter(maskData, stencil, extent);
......
......@@ -28,7 +28,7 @@
/**
* Return file name of a full filename (i.e. file name without path).
*/
std::string GetFilenameName(const std::string& filename)
static std::string GetFilenameName(const std::string& filename)
{
#if defined(_WIN32)
std::string::size_type slash_pos = filename.find_last_of("/\\");
......@@ -49,7 +49,7 @@ std::string GetFilenameName(const std::string& filename)
* Return file name without extension of a full filename (i.e. without path).
* Warning: it considers the longest extension (for example: .tar.gz)
*/
std::string GetFilenameWithoutExtension(const std::string& filename)
static std::string GetFilenameWithoutExtension(const std::string& filename)
{
std::string name = GetFilenameName(filename);
std::string::size_type dot_pos = name.find(".");
......@@ -69,7 +69,7 @@ std::string GetFilenameWithoutExtension(const std::string& filename)
* Warning: it considers the last extension (for example: removes .gz
* from .tar.gz)
*/
std::string GetFilenameWithoutLastExtension(const std::string& filename)
static std::string GetFilenameWithoutLastExtension(const std::string& filename)
{
std::string name = GetFilenameName(filename);
std::string::size_type dot_pos = name.rfind(".");
......
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