更新注册的调整

Author: chexiongsheng

papi-register/include/JSClassRegister.h

@@ -24,16 +24,15 @@ PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS
 #include "PuertsNamespaceDef.h"
 
 #include "pesapi.h"
-#include "TypeInfo.hpp"
-#include "PString.h"
 
 #if USING_IN_UNREAL_ENGINE
 static const FAnsiStringView EditorOnlyPropertySuffix = "_EditorOnly";
 #endif
 
-namespace PUERTS_NAMESPACE
+namespace PUERTS_REG_NAMESPACE
 {
 class CFunctionInfo;
+class PString;
 
 MSVC_PRAGMA(warning(push))
 MSVC_PRAGMA(warning(disable : 4191))

papi-register/include/PuertsNamespaceDef.h

@@ -16,6 +16,14 @@
 #endif
 #endif
 
+#if !defined(PUERTS_REG_NAMESPACE)
+#if defined(WITH_QJS_NAMESPACE_SUFFIX)
+#define PUERTS_REG_NAMESPACE puerts_qjs
+#else
+#define PUERTS_REG_NAMESPACE puerts
+#endif
+#endif
+
 #ifndef PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS
 #if defined(_MSC_VER)
 #define PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS __pragma(warning(push)) __pragma(warning(disable : 4668))

papi-register/source/JSClassRegister.cpp

@@ -13,8 +13,10 @@
 #include <EASTL/map.h>
 #include <EASTL/allocator_malloc.h>
 #include <string.h>
+#include "TypeInfo.hpp"
+#include "PString.h"
 
-namespace PUERTS_NAMESPACE
+namespace PUERTS_REG_NAMESPACE
 {
 template <class T>
 static T* PropertyInfoDuplicate(T* Arr)

papi-register/source/RapiImpl.cpp

@@ -1,4 +1,6 @@
 #include "pesapi.h"
+#include "TypeInfo.hpp"
+#include "PString.h"
 #include "JSClassRegister.h"
 #include <string.h>
 #include <EASTL/vector.h>