Minor fixes

This commit is contained in:
Wojtek Figat
2021-11-07 20:47:29 +01:00
parent b3eb17f61e
commit 7955a6bc35
5 changed files with 9 additions and 3 deletions

View File

@@ -8,6 +8,7 @@ class ScriptingObject;
/// <summary> /// <summary>
/// Network driver implementations enum. /// Network driver implementations enum.
/// [Deprecated in v1.3]
/// </summary> /// </summary>
API_ENUM(Namespace="FlaxEngine.Networking") enum class DEPRECATED NetworkDriverType API_ENUM(Namespace="FlaxEngine.Networking") enum class DEPRECATED NetworkDriverType
{ {
@@ -32,6 +33,7 @@ DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkConfig);
/// <summary> /// <summary>
/// The network driver that will be used to create the peer. /// The network driver that will be used to create the peer.
/// To allow two peers to connect, they must use the same host. /// To allow two peers to connect, they must use the same host.
/// [Deprecated in v1.3]
/// </summary> /// </summary>
API_FIELD() API_FIELD()
DEPRECATED NetworkDriverType NetworkDriverType = NetworkDriverType::ENet; DEPRECATED NetworkDriverType NetworkDriverType = NetworkDriverType::ENet;

View File

@@ -69,6 +69,7 @@ MClass::MClass(const MAssembly* parentAssembly, MonoClass* monoClass, const MStr
MClass::~MClass() MClass::~MClass()
{ {
#if !COMPILE_WITHOUT_CSHARP
#if USE_MONO #if USE_MONO
if (_attrInfo) if (_attrInfo)
mono_custom_attrs_free((MonoCustomAttrInfo*)_attrInfo); mono_custom_attrs_free((MonoCustomAttrInfo*)_attrInfo);
@@ -78,6 +79,7 @@ MClass::~MClass()
_methods.ClearDelete(); _methods.ClearDelete();
_attributes.ClearDelete(); _attributes.ClearDelete();
_events.ClearDelete(); _events.ClearDelete();
#endif
} }
bool MClass::IsGeneric() const bool MClass::IsGeneric() const
@@ -397,7 +399,7 @@ MObject* MClass::GetAttribute(MClass* monoClass)
MonoCustomAttrInfo* attrInfo = GET_CUSTOM_ATTR(); MonoCustomAttrInfo* attrInfo = GET_CUSTOM_ATTR();
return attrInfo ? mono_custom_attrs_get_attr(attrInfo, monoClass->GetNative()) : nullptr; return attrInfo ? mono_custom_attrs_get_attr(attrInfo, monoClass->GetNative()) : nullptr;
#else #else
return false; return nullptr;
#endif #endif
} }

View File

@@ -117,7 +117,7 @@ MObject* MEvent::GetAttribute(MClass* monoClass) const
mono_custom_attrs_free(attrInfo); mono_custom_attrs_free(attrInfo);
return foundAttr; return foundAttr;
#else #else
return false; return nullptr;
#endif #endif
} }

View File

@@ -192,7 +192,7 @@ MObject* MMethod::GetAttribute(MClass* monoClass) const
mono_custom_attrs_free(attrInfo); mono_custom_attrs_free(attrInfo);
return foundAttr; return foundAttr;
#else #else
return false; return nullptr;
#endif #endif
} }

View File

@@ -2,6 +2,8 @@
#pragma once #pragma once
#include "Engine/Platform/Defines.h"
// Forward declarations // Forward declarations
class Scripting; class Scripting;
struct ScriptingType; struct ScriptingType;