Skip to content

Commit

Permalink
Rename variables to fix shadow warnings
Browse files Browse the repository at this point in the history
These warnings appear under NetBSD with GCC 4.5 and they break the build.

This change was r13 in Subversion.
  • Loading branch information
jmmv authored and Julio Merino committed Feb 26, 2012
1 parent d1790df commit 90063db
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions debug.cpp
Expand Up @@ -59,16 +59,16 @@ lutok::debug::~debug(void)
/// Wrapper around lua_getinfo.
///
/// \param s The Lua state.
/// \param what The second parameter to lua_getinfo.
/// \param what_ The second parameter to lua_getinfo.
///
/// \warning Terminates execution if there is not enough memory to manipulate
/// the Lua stack.
void
lutok::debug::get_info(state& s, const std::string& what)
lutok::debug::get_info(state& s, const std::string& what_)
{
lua_State* raw_state = state_c_gate(s).c_state();

if (lua_getinfo(raw_state, what.c_str(), &_pimpl->lua_debug) == 0)
if (lua_getinfo(raw_state, what_.c_str(), &_pimpl->lua_debug) == 0)
throw lutok::api_error::from_stack(s, "lua_getinfo");
}

Expand Down
6 changes: 3 additions & 3 deletions state.cpp
Expand Up @@ -250,9 +250,9 @@ lutok::state::state(void)
/// Instances constructed using this method do NOT own the raw state. This
/// means that, on exit, the state will not be destroyed.
///
/// \param raw_state The raw Lua state to wrap.
lutok::state::state(void* raw_state) :
_pimpl(new impl(reinterpret_cast< lua_State* >(raw_state), false))
/// \param raw_state_ The raw Lua state to wrap.
lutok::state::state(void* raw_state_) :
_pimpl(new impl(reinterpret_cast< lua_State* >(raw_state_), false))
{
}

Expand Down

0 comments on commit 90063db

Please sign in to comment.