diff --git a/Tutorial/Console_Workflow/W01_RunningWorkflowScripts/Main.cpp b/Tutorial/Console_Workflow/W01_RunningWorkflowScripts/Main.cpp index 81da06d7..f3c459fb 100644 --- a/Tutorial/Console_Workflow/W01_RunningWorkflowScripts/Main.cpp +++ b/Tutorial/Console_Workflow/W01_RunningWorkflowScripts/Main.cpp @@ -30,7 +30,7 @@ int main() { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code and get assemblies List> errors; diff --git a/Tutorial/Console_Workflow/W02_InvokingCppClasses/Main.cpp b/Tutorial/Console_Workflow/W02_InvokingCppClasses/Main.cpp index 59ce42fe..4f7fb125 100644 --- a/Tutorial/Console_Workflow/W02_InvokingCppClasses/Main.cpp +++ b/Tutorial/Console_Workflow/W02_InvokingCppClasses/Main.cpp @@ -97,7 +97,7 @@ int main() { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code and get assemblies List> errors; diff --git a/Tutorial/Console_Workflow/W03_InheritingCppInterfaces/Main.cpp b/Tutorial/Console_Workflow/W03_InheritingCppInterfaces/Main.cpp index 388c56d1..36e5d91b 100644 --- a/Tutorial/Console_Workflow/W03_InheritingCppInterfaces/Main.cpp +++ b/Tutorial/Console_Workflow/W03_InheritingCppInterfaces/Main.cpp @@ -123,7 +123,7 @@ int main() { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code and get assemblies List> errors; diff --git a/Tutorial/Console_Workflow/W04_InheritingCppClasses/Main.cpp b/Tutorial/Console_Workflow/W04_InheritingCppClasses/Main.cpp index 41d069de..87fa77b9 100644 --- a/Tutorial/Console_Workflow/W04_InheritingCppClasses/Main.cpp +++ b/Tutorial/Console_Workflow/W04_InheritingCppClasses/Main.cpp @@ -162,7 +162,7 @@ int main() { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code and get assemblies List> errors; diff --git a/Tutorial/Console_Workflow/W05_Compile/Main.cpp b/Tutorial/Console_Workflow/W05_Compile/Main.cpp index 8785cc4d..12d419ef 100644 --- a/Tutorial/Console_Workflow/W05_Compile/Main.cpp +++ b/Tutorial/Console_Workflow/W05_Compile/Main.cpp @@ -50,7 +50,7 @@ int wmain(int argc, const wchar_t* argv[]) { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code // WfLexicalScopeManager is required because we produce assembly and C++ code at the same time diff --git a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp index f431d4c9..538b8463 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp +++ b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp @@ -20,7 +20,6 @@ https://github.com/vczh-libraries #pragma warning(disable:4250) #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wparentheses-equality" #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wparentheses-equality" @@ -64,7 +63,7 @@ Closures void __vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting::Execute(const ::vl::WString& name) { - ::myapi::App::Print(((::vl::WString(L"Hello, ", false) + name) + ::vl::WString(L"!", false))); + ::myapi::App::Print(((::vl::WString::Unmanaged(L"Hello, ") + name) + ::vl::WString::Unmanaged(L"!"))); } } diff --git a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h index b91c4233..f21cbebb 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h +++ b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h @@ -18,7 +18,6 @@ https://github.com/vczh-libraries #pragma warning(disable:4250) #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wparentheses-equality" #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wparentheses-equality" @@ -36,7 +35,7 @@ namespace myscript class MyApp : public ::vl::Object, public ::vl::reflection::Description { friend class ::vl_workflow_global::__vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting; -#ifndef VCZH_DEBUG_NO_REFLECTION +#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif public: diff --git a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp index fcc2e5f9..ab83203a 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp +++ b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp @@ -14,7 +14,6 @@ https://github.com/vczh-libraries #pragma warning(disable:4250) #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wparentheses-equality" #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wparentheses-equality" @@ -33,6 +32,7 @@ namespace vl #ifndef VCZH_DEBUG_NO_REFLECTION IMPL_CPP_TYPE_INFO(myscript::MyApp) +#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA #define _ , BEGIN_CLASS_MEMBER(::myscript::MyApp) CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject) @@ -53,11 +53,12 @@ namespace vl { } }; +#endif #endif bool LoadW05ScriptTypes() { -#ifndef VCZH_DEBUG_NO_REFLECTION +#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA if (auto manager = GetGlobalTypeManager()) { return manager->AddTypeLoader(MakePtr()); diff --git a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h index 85892914..216f54a4 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h +++ b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h @@ -17,7 +17,6 @@ https://github.com/vczh-libraries #pragma warning(disable:4250) #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wparentheses-equality" #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wparentheses-equality" diff --git a/Tutorial/Console_Workflow/W06_Debugging/Main.cpp b/Tutorial/Console_Workflow/W06_Debugging/Main.cpp index eb2755a4..565c5dea 100644 --- a/Tutorial/Console_Workflow/W06_Debugging/Main.cpp +++ b/Tutorial/Console_Workflow/W06_Debugging/Main.cpp @@ -118,7 +118,7 @@ int main() { // prepare Workflow script code List codes; - codes.Add(WString(ScriptCode, false)); + codes.Add(WString::Unmanaged(ScriptCode)); // compile code and get assemblies List> errors;