From 8d0873c1b52ed8ffd679fd8eca40bfef15be66b3 Mon Sep 17 00:00:00 2001
From: nitrocaster <paul-kv@yandex.ru>
Date: Fri, 15 Jan 2016 13:26:57 +0300
Subject: [PATCH] xrScriptEngine: Fix C4456 warnings.

---
 src/xrScriptEngine/Functor.hpp            | 8 ++++----
 src/xrScriptEngine/ScriptEngineScript.cpp | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/xrScriptEngine/Functor.hpp b/src/xrScriptEngine/Functor.hpp
index d57075a5588..ee4eb7ed7f5 100644
--- a/src/xrScriptEngine/Functor.hpp
+++ b/src/xrScriptEngine/Functor.hpp
@@ -16,8 +16,8 @@ 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)...);
     }
 };
 
@@ -25,8 +25,8 @@ 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
index c956b31644c..0769b4d87cc 100644
--- 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")