Skip to content

Commit cfc4f67

Browse files
committed
misc minor unsorted fixes (just saving current state)
1 parent 55ccde8 commit cfc4f67

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

test/experimental/js_compat/build/js_compat.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438
<WarningLevel>Level3</WarningLevel>
439439
<Optimization>Disabled</Optimization>
440440
<SDLCheck>true</SDLCheck>
441-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NODECPP_MEMORY_SAFETY_DBG_ADD_DESTRUCTION_INFO;_DEBUG;_CONSOLE;NODECPP_DEFAULT_LOG_MODULE="NODE";%(PreprocessorDefinitions)</PreprocessorDefinitions>
441+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NODECPP_MEMORY_SAFETY_DBG_ADD_PTR_LIFECYCLE_INFO;_DEBUG;_CONSOLE;NODECPP_DEFAULT_LOG_MODULE="NODE";%(PreprocessorDefinitions)</PreprocessorDefinitions>
442442
<ConformanceMode>true</ConformanceMode>
443443
<LanguageStandard>stdcpplatest</LanguageStandard>
444444
<ExceptionHandling>Async</ExceptionHandling>
@@ -613,7 +613,7 @@
613613
<FunctionLevelLinking>true</FunctionLevelLinking>
614614
<IntrinsicFunctions>true</IntrinsicFunctions>
615615
<SDLCheck>true</SDLCheck>
616-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NODECPP_MEMORY_SAFETY_DBG_ADD_DESTRUCTION_INFO;NDEBUG;_CONSOLE;NODECPP_DEFAULT_LOG_MODULE="NODE";%(PreprocessorDefinitions)</PreprocessorDefinitions>
616+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NODECPP_MEMORY_SAFETY_DBG_ADD_PTR_LIFECYCLE_INFO;NDEBUG;_CONSOLE;NODECPP_DEFAULT_LOG_MODULE="NODE";%(PreprocessorDefinitions)</PreprocessorDefinitions>
617617
<ConformanceMode>true</ConformanceMode>
618618
<LanguageStandard>stdcpplatest</LanguageStandard>
619619
<ExceptionHandling>Async</ExceptionHandling>
@@ -685,7 +685,6 @@
685685
</ItemGroup>
686686
<ItemGroup>
687687
<ClInclude Include="..\..\..\..\include\nodecpp\common.h" />
688-
<ClInclude Include="..\..\..\..\include\nodecpp\ip_and_port.h" />
689688
<ClInclude Include="..\..\..\..\include\nodecpp\js_compat.h" />
690689
<ClInclude Include="..\..\..\..\include\nodecpp\logging.h" />
691690
<ClInclude Include="..\..\..\..\include\nodecpp\mallocator.h" />
@@ -698,6 +697,7 @@
698697
<ClInclude Include="..\user_code\maps\rainbow.h" />
699698
<ClInclude Include="..\user_code\maps\random.h" />
700699
<ClInclude Include="..\user_code\styles.h" />
700+
<ClInclude Include="..\user_code\system\has-flag.h" />
701701
</ItemGroup>
702702
<ItemGroup>
703703
<Natvis Include="..\user_code\js_compat.natvis" />

test/experimental/js_compat/js-compat-tests/misc_tests.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ class MiscTests : public nodecpp::js::JSModule
224224
console.log( "~~~~~~~~~~~~~~" );
225225
console.log( JSVar(tmpObjToPush_2) );
226226

227+
JSVar ttext = "abc";
227228
JSOwnObj badarr = makeJSArray({ 0, 0 });
228229
JSVar badvar = ttext.split( "" );
229230
badarr[0] = badvar;

test/experimental/js_compat/user_code/js_compat.natvis

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
33

4+
<Type Name="::nodecpp::platform::ptrwithdatastructsdefs::optimized_ptr_with_zombie_property_">
5+
<DisplayString>{{optimized_ptr_with_zombie_property_}}</DisplayString>
6+
<Expand>
7+
<Item Name="ptr">(void*)( (uintptr_t)ptr &amp; ~zombie_indicator)</Item>
8+
<Item Name="is_zombie">((uintptr_t)ptr) == zombie_indicator</Item>
9+
</Expand>
10+
</Type>
11+
412
<Type Name="::nodecpp::platform::ptrwithdatastructsdefs::optimized_allocated_ptr_and_ptr_and_data_and_flags_64_&lt;*,*&gt;">
513
<DisplayString>{{optimized_allocated_ptr_and_ptr_and_data_and_flags_64_}}</DisplayString>
614
<Expand>
@@ -10,14 +18,6 @@
1018
</Expand>
1119
</Type>
1220

13-
<Type Name="::nodecpp::platform::ptrwithdatastructsdefs::optimized_ptr_with_zombie_property_">
14-
<DisplayString>{{optimized_ptr_with_zombie_property_}}</DisplayString>
15-
<Expand>
16-
<Item Name="ptr">(void*)( (uintptr_t)ptr &amp; ~zombie_indicator)</Item>
17-
<Item Name="is_zombie">((uintptr_t)ptr) == zombie_indicator</Item>
18-
</Expand>
19-
</Type>
20-
2121
<Type Name="nodecpp::safememory::owning_ptr_impl&lt;*&gt;">
2222
<DisplayString>{{owning_ptr}}</DisplayString>
2323
<Expand>

0 commit comments

Comments
 (0)