Reverted the usage of OSG_UNUSED and OT_UNUSED as in hindsight these should never have been merged. Adding code to quieten
inappropriate warnings is a bad programming practice and does not desrve a place in the OSG code base.
This commit is contained in:
@@ -94,8 +94,6 @@ void Input::_calculateSize(const XYCoord& size) {
|
||||
if(width > getWidth()) setWidth(osg::round(width));
|
||||
|
||||
if(height > getHeight()) setHeight(osg::round(height));
|
||||
#else
|
||||
OSG_UNUSED(size);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -283,11 +281,11 @@ void Input::positioned()
|
||||
}
|
||||
}
|
||||
|
||||
bool Input::keyUp(int /*key*/, int /*mask*/, const WindowManager*) {
|
||||
bool Input::keyUp(int key, int mask, const WindowManager*) {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Input::mouseDrag (double x, double /*y*/, const WindowManager*)
|
||||
bool Input::mouseDrag (double x, double y, const WindowManager*)
|
||||
{
|
||||
_mouseClickX += x;
|
||||
x = _mouseClickX;
|
||||
@@ -308,7 +306,7 @@ bool Input::mouseDrag (double x, double /*y*/, const WindowManager*)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Input::mousePush (double x, double /*y*/, const WindowManager* /*wm*/)
|
||||
bool Input::mousePush (double x, double y, const WindowManager* wm)
|
||||
{
|
||||
double offset = getOrigin().x();
|
||||
Window* window = getParent();
|
||||
|
||||
@@ -142,7 +142,6 @@ bool LuaEngine::eval(const std::string& code) {
|
||||
return true;
|
||||
|
||||
#else
|
||||
OSG_UNUSED(code);
|
||||
return noLuaFail("Can't evaluate code in LuaEngine");
|
||||
#endif
|
||||
}
|
||||
@@ -164,7 +163,6 @@ bool LuaEngine::runFile(const std::string& filePath) {
|
||||
return true;
|
||||
|
||||
#else
|
||||
OSG_UNUSED(filePath);
|
||||
return noLuaFail("Can't run file in LuaEngine");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -156,7 +156,6 @@ bool PythonEngine::eval(const std::string& code) {
|
||||
return true;
|
||||
|
||||
#else
|
||||
OSG_UNUSED(code);
|
||||
return noPythonFail("Can't evaluate code in PythonEngine");
|
||||
#endif
|
||||
}
|
||||
@@ -208,7 +207,6 @@ bool PythonEngine::runFile(const std::string& filePath) {
|
||||
return true;
|
||||
|
||||
#else
|
||||
OSG_UNUSED(filePath);
|
||||
return noPythonFail("Can't evaluate code in PythonEngine");
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user