Merge branch 'master' of https://github.com/ncsoft/Unreal.js-core

Author: Nako Sung

Source/JavascriptUMG/JavascriptMultiBox.cpp

@@ -1,4 +1,7 @@
 #include "JavascriptUMG.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "JavascriptMultiBox.h"
 #include "SJavascriptBox.h"
 
@@ -62,3 +65,5 @@ void UJavascriptMultiBox::AddSubMenu(FJavascriptMenuBuilder& Builder, FName Id,
 		);
 	}
 }
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/Debugger.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "JavascriptIsolate.h"
 #include "JavascriptContext.h"
 #include "SocketSubSystem.h"
@@ -431,4 +434,6 @@ IJavascriptDebugger* IJavascriptDebugger::Create(int32 InPort, Local<Context> In
 {
 	return nullptr;
 } 
-#endif
+#endif
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/Delegates.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "JavascriptDelegate.h"
 #include "Translator.h"
 #include "Delegates.h"
@@ -400,4 +403,6 @@ void UJavascriptDelegate::ProcessEvent(UFunction* Function, void* Parms)
 	{
 		JavascriptDelegate.Pin()->Fire(Parms, this);
 	}
-}
+}
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/FunctionCall.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "Translator.h"
 #include "Exception.h"
 #include "Helpers.h"
@@ -109,4 +112,6 @@ namespace v8
 			}
 		}		
 	}
-}
+}
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/JavascriptContext_Private.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "JavascriptIsolate.h"
 #include "JavascriptContext.h"
 #include "JavascriptComponent.h"
@@ -1884,3 +1887,5 @@ inline void FJavascriptContextImplementation::AddReferencedObjects(UObject * InT
 		Collector.AddReferencedObject(It.Key()->Struct, InThis);
 	}
 }
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/JavascriptIsolate_Private.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "Config.h"
 #include "MallocArrayBufferAllocator.h"
 #include "Translator.h"
@@ -2292,4 +2295,6 @@ void FJavascriptFunction::Execute(UScriptStruct* Struct, void* Buffer)
 	auto function = Local<Function>::New(Handle->isolate, Handle->Function);
 	v8::Handle<Value> args[] = { arg };
 	function->Call(function, 1, args);
-}
+}
+
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/V8Module.cpp

@@ -1,4 +1,7 @@
 #include "V8PCH.h"
+
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include <libplatform/libplatform.h>
 #include "JavascriptContext.h"
 #include "IV8.h"
@@ -192,4 +195,4 @@ class V8Module : public IV8
 
 IMPLEMENT_MODULE(V8Module, V8)
 
-
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/V8PCH.h

@@ -7,10 +7,14 @@
 #pragma warning( disable : 4946 )
 #pragma warning( disable : 4191 )
 
+PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
+
 #include "v8.h"
 #include <v8-debug.h>
 #include <v8-profiler.h>
 
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
+
 #pragma warning( pop )
 
 DECLARE_LOG_CATEGORY_EXTERN(Javascript, Log, All);