AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fixes for GCC 4.6 warnings.

Browse Source
This commit is contained in:
David Williams 2011-07-01 22:48:02 +01:00
parent 2da63912fb
commit 61f97bb8db
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams Copyright (c) 2005-2009 David Williams
@ -21,7 +20,6 @@ freely, subject to the following restrictions:
3. This notice may not be removed or altered from any source 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_GradientEstimators_H__ #ifndef __PolyVox_GradientEstimators_H__
#define __PolyVox_GradientEstimators_H__ #define __PolyVox_GradientEstimators_H__

2
library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
View File

@ -61,7 +61,7 @@ namespace PolyVox
void addTriangleCubic(uint32_t index0, uint32_t index1, uint32_t index2); void addTriangleCubic(uint32_t index0, uint32_t index1, uint32_t index2);
uint32_t addVertex(const VertexType& vertex); uint32_t addVertex(const VertexType& vertex);
void clear(void); void clear(void);
const bool isEmpty(void) const; bool isEmpty(void) const;
//THESE FUNCTIONS TO BE REMOVED IN THE FUTURE. OR AT LEAST MOVED OUT OF THIS CLASS INTO FREE FUNCTIONS. //THESE FUNCTIONS TO BE REMOVED IN THE FUTURE. OR AT LEAST MOVED OUT OF THIS CLASS INTO FREE FUNCTIONS.
//THEY ARE CAUSING PROBLEMS WITH THE SWIG BINDINGS. THE FUNCTIONS REGARDING NORMALS MAKE NO SENSE WHEN //THEY ARE CAUSING PROBLEMS WITH THE SWIG BINDINGS. THE FUNCTIONS REGARDING NORMALS MAKE NO SENSE WHEN

2
library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
View File

@ -141,7 +141,7 @@ namespace PolyVox
} }
template <typename VertexType> template <typename VertexType>
const bool SurfaceMesh<VertexType>::isEmpty(void) const bool SurfaceMesh<VertexType>::isEmpty(void) const
{ {
return (getNoOfVertices() == 0) || (getNoOfIndices() == 0); return (getNoOfVertices() == 0) || (getNoOfIndices() == 0);
} }

2
library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
View File

@ -85,9 +85,9 @@ namespace PolyVox
} }
PolyVox::Vector3DInt32 position; PolyVox::Vector3DInt32 position;
Node* parent;
float gVal; float gVal;
float hVal; float hVal;
Node* parent;
float f(void) const float f(void) const
{ {