fix: clang build

Author: qubka

src/attribute.cpp

@@ -4,9 +4,13 @@
 
 using namespace netlm;
 
+Attribute::~Attribute() {
+	delete _type;
+}
+
 Type& Attribute::GetType() {
 	if (!_type) {
-		_type = std::make_unique<Type>();
+		_type = new Type();
 		Managed.GetAttributeTypeFptr(_handle, &_type->_handle);
 	}
 

src/attribute.hpp

@@ -7,6 +7,8 @@ namespace netlm {
 
 	class Attribute {
 	public:
+		~Attribute();
+
 		Type& GetType();
 
 		template<typename TReturn>
@@ -25,7 +27,7 @@ namespace netlm {
 
 	private:
 		ManagedHandle _handle{};
-		std::unique_ptr<Type> _type;
+		Type* _type = nullptr;
 
 		friend class Type;
 		friend class MethodInfo;

src/field_info.cpp

@@ -5,6 +5,10 @@
 
 using namespace netlm;
 
+FieldInfo::~FieldInfo() {
+	delete _type;
+}
+
 std::string FieldInfo::GetName() const {
 	auto name = Managed.GetFieldInfoNameFptr(_handle);
 	std::string str(name);
@@ -14,7 +18,7 @@ std::string FieldInfo::GetName() const {
 
 Type& FieldInfo::GetType() {
 	if (!_type) {
-		_type = std::make_unique<Type>();
+		_type = new Type();
 		Managed.GetFieldInfoTypeFptr(_handle, &_type->_handle);
 	}
 

src/field_info.hpp

@@ -9,6 +9,8 @@ namespace netlm {
 
 	class FieldInfo {
 	public:
+		~FieldInfo();
+
 		std::string GetName() const;
 		Type& GetType();
 
@@ -22,7 +24,7 @@ namespace netlm {
 
 	private:
 		ManagedHandle _handle{};
-		std::unique_ptr<Type> _type;
+		Type* _type = nullptr;
 
 		friend class Type;
 		friend class ManagedObject;

src/method_info.cpp

@@ -5,6 +5,11 @@
 
 using namespace netlm;
 
+MethodInfo::~MethodInfo() {
+	delete _parameterTypes;
+	delete _returnType;
+}
+
 std::string MethodInfo::GetName() const {
 	auto name = Managed.GetMethodInfoNameFptr(_handle);
 	std::string str(name);
@@ -18,28 +23,27 @@ void* MethodInfo::GetFunctionAddress() const {
 
 Type& MethodInfo::GetReturnType() {
 	if (!_returnType) {
-		_returnType = std::make_unique<Type>();
+		_returnType = new Type();
 		Managed.GetMethodInfoReturnTypeFptr(_handle, &_returnType->_handle);
 	}
 
 	return *_returnType;
 }
 
 const std::vector<Type>& MethodInfo::GetParameterTypes() {
-	if (_parameterTypes.empty()) {
+	if (!_parameterTypes) {
 		int32_t parameterCount;
 		Managed.GetMethodInfoParameterTypesFptr(_handle, nullptr, &parameterCount);
 		std::vector<ManagedHandle> parameterTypes(static_cast<size_t>(parameterCount));
 		Managed.GetMethodInfoParameterTypesFptr(_handle, parameterTypes.data(), &parameterCount);
 
-		_parameterTypes.reserve(parameterTypes.size());
-
-		for (ManagedHandle parameterType : parameterTypes) {
-			_parameterTypes.emplace_back(parameterType);
-		}
+		_parameterTypes = new std::vector<Type>();
+		_parameterTypes->reserve(parameterTypes.size());
+		for (size_t i = 0; i < parameterTypes.size(); i++)
+			_parameterTypes->emplace_back(parameterTypes[i]);
 	}
 
-	return _parameterTypes;
+	return *_parameterTypes;
 }
 
 TypeAccessibility MethodInfo::GetAccessibility() const {

src/method_info.hpp

@@ -3,12 +3,16 @@
 #include "core.hpp"
 #include "native_string.hpp"
 
+#include "plg/inplace_vector.hpp"
+
 namespace netlm {
 	class Type;
 	class Attribute;
 
 	class MethodInfo {
 	public:
+		~MethodInfo();
+
 		std::string GetName() const;
 		void* GetFunctionAddress() const;
 
@@ -27,8 +31,8 @@ namespace netlm {
 
 	private:
 		ManagedHandle _handle{};
-		std::unique_ptr<Type> _returnType;
-		std::vector<Type> _parameterTypes;
+		Type* _returnType = nullptr;
+		std::vector<Type>* _parameterTypes = nullptr;
 
 		friend class Type;
 		friend class ManagedObject;

src/property_info.cpp

@@ -5,6 +5,10 @@
 
 using namespace netlm;
 
+PropertyInfo::~PropertyInfo() {
+	delete _type;
+}
+
 std::string PropertyInfo::GetName() const {
 	auto name = Managed.GetPropertyInfoNameFptr(_handle);
 	std::string str(name);
@@ -14,7 +18,7 @@ std::string PropertyInfo::GetName() const {
 
 Type& PropertyInfo::GetType() {
 	if (!_type) {
-		_type = std::make_unique<Type>();
+		_type = new Type();
 		Managed.GetPropertyInfoTypeFptr(_handle, &_type->_handle);
 	}
 

src/property_info.hpp

@@ -9,6 +9,8 @@ namespace netlm {
 
 	class PropertyInfo {
 	public:
+		~PropertyInfo();
+
 		std::string GetName() const;
 		Type& GetType();
 
@@ -20,7 +22,7 @@ namespace netlm {
 
 	private:
 		ManagedHandle _handle{};
-		std::unique_ptr<Type> _type;
+		Type* _type = nullptr;
 
 		friend class Type;
 		friend class ManagedObject;

src/type.cpp

@@ -20,7 +20,7 @@ std::string Type::GetAssemblyQualifiedName() const {
 
 Type& Type::GetBaseType() {
 	if (!_baseType) {
-		_baseType = std::make_unique<Type>();
+		_baseType = new Type();
 		Managed.GetBaseTypeFptr(_handle, &_baseType->_handle);
 	}
 
@@ -183,7 +183,7 @@ std::vector<int> Type::GetEnumValues() const {
 
 Type& Type::GetElementType() {
 	if (!_elementType) {
-		_elementType = std::make_unique<Type>();
+		_elementType = new Type();
 		Managed.GetElementTypeFptr(_handle, &_elementType->_handle);
 	}
 

src/type.hpp

@@ -118,8 +118,8 @@ namespace netlm {
 
 	private:
 		ManagedHandle _handle{};
-		std::unique_ptr<Type> _baseType;
-		std::unique_ptr<Type> _elementType;
+		Type* _baseType = nullptr;
+		Type* _elementType = nullptr;
 
 		friend class ManagedAssembly;
 		friend class MethodInfo;