Warning fixes for GCC 4.6.
This commit is contained in:
@ -211,7 +211,6 @@ void Perlin::init(void)
|
||||
float Perlin::perlin_noise_2D(float vec[2])
|
||||
{
|
||||
int terms = mOctaves;
|
||||
float freq = mFrequency;
|
||||
float result = 0.0f;
|
||||
float amp = mAmplitude;
|
||||
|
||||
@ -233,7 +232,6 @@ float Perlin::perlin_noise_2D(float vec[2])
|
||||
float Perlin::perlin_noise_3D(float vec[3])
|
||||
{
|
||||
int terms = mOctaves;
|
||||
float freq = mFrequency;
|
||||
float result = 0.0f;
|
||||
float amp = mAmplitude;
|
||||
|
||||
|
@ -8844,7 +8844,7 @@ GLboolean glxewGetExtension (const char* name)
|
||||
GLuint len = _glewStrLen((const GLubyte*)name);
|
||||
/* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */
|
||||
/* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */
|
||||
if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE;
|
||||
if (glXGetCurrentDisplay == NULL) return GL_FALSE;
|
||||
p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS);
|
||||
if (0 == p) return GL_FALSE;
|
||||
end = p + _glewStrLen(p);
|
||||
|
@ -238,7 +238,8 @@ void load(const ConstVolumeProxy<MaterialDensityPair44>& volume, const PolyVox::
|
||||
}
|
||||
}
|
||||
}
|
||||
void unload(const ConstVolumeProxy<MaterialDensityPair44>& vol, const PolyVox::Region& reg)
|
||||
|
||||
void unload(const ConstVolumeProxy<MaterialDensityPair44>& /*vol*/, const PolyVox::Region& reg)
|
||||
{
|
||||
std::cout << "warning unloading region: " << reg.getLowerCorner() << " -> " << reg.getUpperCorner() << std::endl;
|
||||
}
|
||||
|
Reference in New Issue
Block a user