This commit is contained in:
Zihan Chen
2017-01-31 19:02:59 -08:00
parent 38fbd0f688
commit 31f18d27a3
4 changed files with 5 additions and 9 deletions
-4
View File
@@ -5607,10 +5607,6 @@ GuiTemplateInstanceLoader
{
List<ITypeDescriptor*> tds;
tds.Add(typeInfo.typeDescriptor);
if (typeInfo.typeDescriptor == description::GetTypeDescriptor<GuiToolstripButtonTemplate>())
{
int a = 0;
}
for (vint i = 0; i < tds.Count(); i++)
{
+1 -1
View File
@@ -2182,7 +2182,7 @@ GuiEventInfoImpl
{
}
ICpp* GetCpp()override
IEventInfo::ICpp* GetCpp()override
{
return isCompositionEvent ? this : nullptr;
}
+2 -2
View File
@@ -12031,7 +12031,7 @@ TypeInfoRetriver Helper Functions (BoxValue, UnboxValue)
template<typename T>
Value BoxValue(const T& object, ITypeDescriptor* typeDescriptor=0)
{
using Type = RemoveCVR<T>::Type;
using Type = typename RemoveCVR<T>::Type;
return ValueAccessor<Type, TypeInfoRetriver<Type>::Decorator>::BoxValue(object, typeDescriptor);
}
@@ -12044,7 +12044,7 @@ TypeInfoRetriver Helper Functions (BoxValue, UnboxValue)
template<typename T>
T UnboxValue(const Value& value, ITypeDescriptor* typeDescriptor=0, const WString& valueName=L"value")
{
using Type = RemoveCVR<T>::Type;
using Type = typename RemoveCVR<T>::Type;
return ValueAccessor<Type, TypeInfoRetriver<Type>::Decorator>::UnboxValue(value, typeDescriptor, valueName);
}
+2 -2
View File
@@ -1862,7 +1862,7 @@ namespace vl
namespace workflow
{
/// <summary>Print a Workflow attribute.</summary>
/// <param name="attribute">The Workflow attribute.</param>
/// <param name="node">The Workflow attribute.</param>
/// <param name="indent">The indentation.</param>
/// <param name="writer">The target writer.</param>
extern void WfPrint(Ptr<WfAttribute> node, const WString& indent, parsing::ParsingWriter& writer);
@@ -1893,7 +1893,7 @@ namespace vl
extern void WfPrint(Ptr<WfModule> node, const WString& indent, parsing::ParsingWriter& writer);
/// <summary>Print a Workflow attribute.</summary>
/// <param name="attribute">The Workflow attribute.</param>
/// <param name="node">The Workflow attribute.</param>
/// <param name="indent">The indentation.</param>
/// <param name="writer">The target writer.</param>
extern void WfPrint(Ptr<WfAttribute> node, const WString& indent, stream::TextWriter& writer);