fix OCLint warning: short variable name, unused parameter

This commit is contained in:
Dennis Luxen 2014-11-20 14:55:43 +01:00
parent cbfbcdcff5
commit c658ee5c78
3 changed files with 5 additions and 9 deletions

View File

@ -210,8 +210,7 @@ int Extractor::Run(int argc, char *argv[])
case osmium::item_type::relation:
++number_of_relations;
resulting_restrictions.push_back(
restriction_parser.TryParse(scripting_environment.getLuaState(),
static_cast<osmium::Relation &>(*entity)));
restriction_parser.TryParse(static_cast<osmium::Relation &>(*entity)));
break;
default:
++number_of_others;

View File

@ -39,13 +39,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/ref.hpp>
#include <boost/regex.hpp>
#include <cstring>
namespace
{
int lua_error_callback(lua_State *L)
int lua_error_callback(lua_State *lua_state)
{
luabind::object error_msg(luabind::from_stack(L, -1));
luabind::object error_msg(luabind::from_stack(lua_state, -1));
std::ostringstream error_stream;
error_stream << error_msg;
throw OSRMException("ERROR occured in profile script:\n" + error_stream.str());
@ -106,7 +104,7 @@ void RestrictionParser::ReadRestrictionExceptions(lua_State *lua_state)
}
mapbox::util::optional<InputRestrictionContainer>
RestrictionParser::TryParse(lua_State *lua_state, osmium::Relation &relation) const
RestrictionParser::TryParse(osmium::Relation &relation) const
{
// return if turn restrictions should be ignored
if (!use_turn_restrictions)

View File

@ -46,8 +46,7 @@ class RestrictionParser
public:
// RestrictionParser(ScriptingEnvironment &scripting_environment);
RestrictionParser(lua_State *lua_state);
mapbox::util::optional<InputRestrictionContainer> TryParse(lua_State *lua_state,
osmium::Relation &relation) const;
mapbox::util::optional<InputRestrictionContainer> TryParse(osmium::Relation &relation) const;
private:
void ReadUseRestrictionsSetting(lua_State *lua_state);