xrScriptEngine: Fix C4456 warnings.

OpenXRay · Jan 15, 2016 · 8d0873c · 8d0873c
1 parent 86bf661
commit 8d0873c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/xrScriptEngine/Functor.hpp b/src/xrScriptEngine/Functor.hpp
@@ -16,17 +16,17 @@ class functor : public adl::object
     template <typename... Args>
     TResult operator()(Args &&...args) const
     {
-        auto self = static_cast<const adl::object *>(this);
-        return call_function<TResult, policy_list<Policies...>>(*self, std::forward<Args>(args)...);
+        auto obj = static_cast<const adl::object *>(this);
+        return call_function<TResult, policy_list<Policies...>>(*obj, std::forward<Args>(args)...);
     }
 };
 
 template <>
 template <typename... Args>
 void functor<void, typename...>::operator()(Args &&...args) const
 {
-    auto self = static_cast<const adl::object *>(this);
-    call_function<void, policy_list<Policies...>>(*self, std::forward<Args>(args)...);
+    auto obj = static_cast<const adl::object *>(this);
+    call_function<void, policy_list<Policies...>>(*obj, std::forward<Args>(args)...);
 }
 
 namespace detail

diff --git a/src/xrScriptEngine/ScriptEngineScript.cpp b/src/xrScriptEngine/ScriptEngineScript.cpp
@@ -14,8 +14,6 @@
 #include "Include/xrAPI/xrAPI.h"
 #include "ScriptExporter.hpp"
 
-using namespace luabind;
-
 void LuaLog(LPCSTR caMessage)
 {
 #ifndef MASTER_GOLD
@@ -151,6 +149,7 @@ std::ostream& operator<<(std::ostream& os, const profile_timer_script& pt)
 
 SCRIPT_EXPORT(CScriptEngine, (),
 {
+    using namespace luabind;
     module(luaState)
     [
         class_<profile_timer_script>("profile_timer")