mirror of
https://github.com/vczh-libraries/Release.git
synced 2026-05-21 04:31:33 +08:00
Update release
This commit is contained in:
+14
-14
@@ -1074,11 +1074,11 @@ Cpp Helper Functions
|
||||
}
|
||||
else if ((prop->GetOwnerTypeDescriptor()->GetTypeDescriptorFlags() & TypeDescriptorFlags::ReferenceType) != TypeDescriptorFlags::Undefined)
|
||||
{
|
||||
return WString(L"$This->$Name", false);
|
||||
return WString::Unmanaged(L"$This->$Name");
|
||||
}
|
||||
else
|
||||
{
|
||||
return WString(L"$This.$Name", false);
|
||||
return WString::Unmanaged(L"$This.$Name");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1091,11 +1091,11 @@ Cpp Helper Functions
|
||||
|
||||
if (method->IsStatic())
|
||||
{
|
||||
return WString(L"::vl::Func<$Func>(&$Type::$Name)", false);
|
||||
return WString::Unmanaged(L"::vl::Func<$Func>(&$Type::$Name)");
|
||||
}
|
||||
else
|
||||
{
|
||||
return WString(L"::vl::Func<$Func>($This, &$Type::$Name)", false);
|
||||
return WString::Unmanaged(L"::vl::Func<$Func>($This, &$Type::$Name)");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1108,34 +1108,34 @@ Cpp Helper Functions
|
||||
|
||||
if (method->GetOwnerMethodGroup() == method->GetOwnerTypeDescriptor()->GetConstructorGroup())
|
||||
{
|
||||
return WString(L"new $Type($Arguments)", false);
|
||||
return WString::Unmanaged(L"new $Type($Arguments)");
|
||||
}
|
||||
else if (method->IsStatic())
|
||||
{
|
||||
return WString(L"$Type::$Name($Arguments)", false);
|
||||
return WString::Unmanaged(L"$Type::$Name($Arguments)");
|
||||
}
|
||||
else
|
||||
{
|
||||
return WString(L"$This->$Name($Arguments)", false);
|
||||
return WString::Unmanaged(L"$This->$Name($Arguments)");
|
||||
}
|
||||
}
|
||||
|
||||
WString CppGetAttachTemplate(IEventInfo* ev)
|
||||
{
|
||||
auto cpp = ev->GetCpp();
|
||||
return cpp == nullptr ? WString(L"::vl::__vwsn::EventAttach($This->$Name, $Handler)", false) : cpp->GetAttachTemplate();
|
||||
return cpp == nullptr ? WString::Unmanaged(L"::vl::__vwsn::EventAttach($This->$Name, $Handler)") : cpp->GetAttachTemplate();
|
||||
}
|
||||
|
||||
WString CppGetDetachTemplate(IEventInfo* ev)
|
||||
{
|
||||
auto cpp = ev->GetCpp();
|
||||
return cpp == nullptr ? WString(L"::vl::__vwsn::EventDetach($This->$Name, $Handler)", false) : cpp->GetDetachTemplate();
|
||||
return cpp == nullptr ? WString::Unmanaged(L"::vl::__vwsn::EventDetach($This->$Name, $Handler)") : cpp->GetDetachTemplate();
|
||||
}
|
||||
|
||||
WString CppGetInvokeTemplate(IEventInfo* ev)
|
||||
{
|
||||
auto cpp = ev->GetCpp();
|
||||
return cpp == nullptr ? WString(L"::vl::__vwsn::EventInvoke($This->$Name)($Arguments)", false) : cpp->GetInvokeTemplate();
|
||||
return cpp == nullptr ? WString::Unmanaged(L"::vl::__vwsn::EventInvoke($This->$Name)($Arguments)") : cpp->GetInvokeTemplate();
|
||||
}
|
||||
|
||||
bool CppExists(ITypeDescriptor* type)
|
||||
@@ -1420,17 +1420,17 @@ TypeDescriptorImplBase
|
||||
TypeDescriptorImplBase::TypeDescriptorImplBase(TypeDescriptorFlags _typeDescriptorFlags, const TypeInfoContent* _typeInfoContent)
|
||||
:typeDescriptorFlags(_typeDescriptorFlags)
|
||||
, typeInfoContent(_typeInfoContent)
|
||||
, typeName(_typeInfoContent->typeName, false)
|
||||
, typeName(WString::Unmanaged(_typeInfoContent->typeName))
|
||||
{
|
||||
switch (typeInfoContent->cppName)
|
||||
{
|
||||
case TypeInfoContent::VlppType:
|
||||
break;
|
||||
case TypeInfoContent::CppType:
|
||||
cppFullTypeName = WString(typeInfoContent->typeName, false);
|
||||
cppFullTypeName = WString::Unmanaged(typeInfoContent->typeName);
|
||||
break;
|
||||
case TypeInfoContent::Renamed:
|
||||
cppFullTypeName = WString(typeInfoContent->cppFullTypeName, false);
|
||||
cppFullTypeName = WString::Unmanaged(typeInfoContent->cppFullTypeName);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -2992,7 +2992,7 @@ TypedValueSerializerProvider
|
||||
|
||||
bool TypedValueSerializerProvider<wchar_t>::Serialize(const wchar_t& input, WString& output)
|
||||
{
|
||||
output = input ? WString(input) : L"";
|
||||
output = input ? WString::FromChar(input) : L"";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user