忽略4191告警

Tencent · Oct 24, 2024 · af581ca · af581ca
1 parent 097e304
commit af581ca
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/unreal/Puerts/Source/JsEnv/Private/CppObjectMapper.cpp b/unreal/Puerts/Source/JsEnv/Private/CppObjectMapper.cpp
@@ -162,6 +162,8 @@ static void CDataNew(const v8::FunctionCallbackInfo<v8::Value>& Info)
     }
 }
 
+MSVC_PRAGMA(warning(push))
+MSVC_PRAGMA(warning(disable : 4191))
 v8::Local<v8::FunctionTemplate> FCppObjectMapper::GetTemplateOfClass(v8::Isolate* Isolate, const JSClassDefinition* ClassDefinition)
 {
     auto Iter = TypeIdToTemplateMap.find(ClassDefinition->TypeId);
@@ -293,6 +295,7 @@ v8::Local<v8::FunctionTemplate> FCppObjectMapper::GetTemplateOfClass(v8::Isolate
         return v8::Local<v8::FunctionTemplate>::New(Isolate, Iter->second);
     }
 }
+MSVC_PRAGMA(warning(pop))
 
 static void CDataGarbageCollectedWithFree(const v8::WeakCallbackInfo<JSClassDefinition>& Data)
 {

diff --git a/unreal/Puerts/Source/JsEnv/Private/PesapiV8Impl.cpp b/unreal/Puerts/Source/JsEnv/Private/PesapiV8Impl.cpp
@@ -18,14 +18,6 @@
 #include <vector>
 #include <cstring>
 
-#ifndef MSVC_PRAGMA
-#if !defined(__clang__) && defined(_MSC_VER)
-#define MSVC_PRAGMA(Pragma) __pragma(Pragma)
-#else
-#define MSVC_PRAGMA(...)
-#endif
-#endif
-
 struct pesapi_env_ref__
 {
     explicit pesapi_env_ref__(v8::Local<v8::Context> context)
@@ -964,8 +956,6 @@ static void free_property_descriptor(pesapi_property_descriptor properties, size
 // set module name here during loading, set nullptr after module loaded
 const char* GPesapiModuleName = nullptr;
 
-MSVC_PRAGMA(warning(push))
-MSVC_PRAGMA(warning(disable : 4191))
 void pesapi_define_class(const void* type_id, const void* super_type_id, const char* type_name, pesapi_constructor constructor,
     pesapi_finalize finalize, size_t property_count, pesapi_property_descriptor properties, void* data)
 {
@@ -1035,7 +1025,6 @@ void pesapi_define_class(const void* type_id, const void* super_type_id, const c
 
     puerts::RegisterJSClass(classDef);
 }
-MSVC_PRAGMA(warning(pop))
 
 void* pesapi_get_class_data(const void* type_id, bool force_load)
 {

diff --git a/unreal/Puerts/Source/JsEnv/Private/StructWrapper.cpp b/unreal/Puerts/Source/JsEnv/Private/StructWrapper.cpp
@@ -77,6 +77,8 @@ void FStructWrapper::RefreshMethod(UFunction* InFunction)
     }
 }
 
+MSVC_PRAGMA(warning(push))
+MSVC_PRAGMA(warning(disable : 4191))
 void FStructWrapper::InitTemplateProperties(
     v8::Isolate* Isolate, UStruct* InStruct, v8::Local<v8::FunctionTemplate> Template, bool IsReuseTemplate)
 {
@@ -456,6 +458,7 @@ v8::Local<v8::FunctionTemplate> FStructWrapper::ToFunctionTemplate(v8::Isolate*
 
     return Result;
 }
+MSVC_PRAGMA(warning(pop))
 
 void FStructWrapper::StaticClass(const v8::FunctionCallbackInfo<v8::Value>& Info)
 {

diff --git a/unreal/Puerts/Source/JsEnv/Public/JSClassRegister.h b/unreal/Puerts/Source/JsEnv/Public/JSClassRegister.h
@@ -38,6 +38,9 @@ static const FAnsiStringView EditorOnlyPropertySuffix = "_EditorOnly";
 namespace PUERTS_NAMESPACE
 {
 class CFunctionInfo;
+
+MSVC_PRAGMA(warning(push))
+MSVC_PRAGMA(warning(disable : 4191))
 struct JSENV_API JSFunctionInfo
 {
     JSFunctionInfo() : Name(nullptr), Callback(nullptr)
@@ -92,6 +95,7 @@ struct JSENV_API JSPropertyInfo
     void* GetterData = nullptr;
     void* SetterData = nullptr;
 };
+MSVC_PRAGMA(warning(pop))
 
 struct NamedFunctionInfo;
 struct NamedPropertyInfo;

diff --git a/unreal/Puerts/Source/JsEnv/Public/PuertsNamespaceDef.h b/unreal/Puerts/Source/JsEnv/Public/PuertsNamespaceDef.h
@@ -36,3 +36,11 @@
 #define PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS _Pragma("GCC diagnostic pop")
 #endif
 #endif    // PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS
+
+#ifndef MSVC_PRAGMA
+#if !defined(__clang__) && defined(_MSC_VER)
+#define MSVC_PRAGMA(Pragma) __pragma(Pragma)
+#else
+#define MSVC_PRAGMA(...)
+#endif
+#endif