Commit 7d19183e authored by Robert Menzel's avatar Robert Menzel

removed warnings

parent b4d35075
......@@ -73,7 +73,7 @@ public:
// ==================================================================================================== \/
public:
//! Tells whether a mapping for a given name exists
inline bool exists(const std::string& _name) const { mMappings.find(_name) != mMappings.end(); }
inline bool exists(const std::string& _name) const { return (mMappings.find(_name) != mMappings.end()); }
// =================================================================================================== \/
// ============================================================================================ FIELDS \/
......
......@@ -132,7 +132,7 @@ public:
TimerQuery() : AsynchronousQuery( GL_TIME_ELAPSED ) {}
//! Mark the moment in the pipeline of which the time should get queried.
GLint saveTimestamp(void) {
void saveTimestamp(void) {
glQueryCounter( mObjectName, GL_TIMESTAMP );
}
......
......@@ -43,7 +43,7 @@ SharedVertexBufferObject VertexBufferObjectControlFileOBJ::create(void)
// if(loadOBJ(vertexBuffer))
// return vertexBuffer;
// return SharedVertexBufferObject();
return SharedVertexBufferObject();
}
bool VertexBufferObjectControlFileOBJ::update(SharedVertexBufferObject& _vertexBuffer)
......@@ -331,5 +331,5 @@ bool VertexBufferObjectControlFileOBJ::loadOBJ(SharedVertexBufferObject& _vertex
// }
// error() << "Failed to open file: " << getFullFilePath() << std::endl;
// return false;
return false;
}
......@@ -97,8 +97,8 @@ void ShaderProgram::setFragmentDataLocationsByFBO(ConstSharedFrameBufferObject _
{
// find out whether a fragment data location with a matching name exists in this shader
GLint fragmentDataLocation = getFragmentDataLocation(fboAttachments[i].name);
if(fragmentDataLocation != -1 // fragment data location with that name exists?
&& fragmentDataLocation != i) // fragment data location with that name not already bound correctly?
if ( fragmentDataLocation != -1 // fragment data location with that name exists?
&& fragmentDataLocation != (GLint) i) // fragment data location with that name not already bound correctly?
{
bindFragmentDataLocation(fboAttachments[i].name, i);
......
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