Fixed natvis and increased version to 1.5.2.

The sentinel for 64 bit pointers got changed in 402ac93. I forgot to adapt the sentinel in natvis.

Author: Sedeniono

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
     tiny-optional
-    VERSION 1.5.1
+    VERSION 1.5.2
     DESCRIPTION "Replacement for std::optional that does not waste memory unnecessarily."
     HOMEPAGE_URL "https://github.com/Sedeniono/tiny-optional"
     LANGUAGES CXX

include/tiny/optional.h

@@ -54,8 +54,8 @@ Original repository: https://github.com/Sedeniono/tiny-optional
 // So the format is:          MmmmPP, where 'M'=major, 'm'=minor and 'P'=patch.
 // E.g. TINY_OPTIONAL_VERSION 100301
 //
-#define TINY_OPTIONAL_VERSION_MAJOR_MINOR 1005 // If you change this, adapt Natvis, too!
-#define TINY_OPTIONAL_VERSION_PATCH 1
+#define TINY_OPTIONAL_VERSION_MAJOR_MINOR 1005 // If you change this, adapt Natvis and CMakeLists.txt, too!
+#define TINY_OPTIONAL_VERSION_PATCH 2 // If you change this, adapt CMakeLists.txt, too!
 #define TINY_OPTIONAL_VERSION (TINY_OPTIONAL_VERSION_MAJOR_MINOR * 100 + TINY_OPTIONAL_VERSION_PATCH)
 
 

include/tiny_optional.natvis

@@ -141,7 +141,7 @@ NOTES:
   natvis error debug output is enabled in the options).
   So instead this visualizer accepts EVERY tiny::optional_flag_manipulator<T, void>. If T is bool, float or double, 
   the "overloads" above are used. If T is anything else, this here is used. The trick to check whether T is a pointer 
-  or not is in the definition of the IsEmpty() intrinsic: We do *&mStorage.storage, which is invalid if storage is not 
+  or not is in the definition of the IsEmpty() intrinsic: We do &*mStorage.storage, which is invalid if storage is not 
   a pointer. Then, the condition "IsEmpty() || !IsEmpty()" is always true for a pointer and undefined for non-pointers.
   In case of undefined, the Optional="true" comes into play.
   Note: Using pure natvis, it is impossible to properly query the IsEmpty flag. Natvis does not allow to call functions,
@@ -152,7 +152,7 @@ NOTES:
     <Intrinsic Name="IsEmpty" Optional="true" Expression="
                sizeof(&amp;*mStorage.storage) == 4
                ? ((unsigned int)(void*)mStorage.storage) == 0xffffffff - 8
-               : ((unsigned long long)(void*)mStorage.storage) == 0xffff800000000000ull - 1
+               : ((unsigned long long)(void*)mStorage.storage) == 0x7fffffffffffffffull
                "/>
     <!--Used for pointers-->
     <DisplayString Optional="true" Condition="IsEmpty() || !IsEmpty()">{*this,view(TinyOptionalInplaceStorageView)}</DisplayString>
@@ -176,7 +176,7 @@ NOTES:
     <Intrinsic Name="IsEmpty" Optional="true" Expression="
                sizeof(&amp;**(FlagType*)(((unsigned char*)&amp;mStorage.storage) + $T2)) == 4
                ? ((unsigned int)(void*)*(FlagType*)(((unsigned char*)&amp;mStorage.storage) + $T2)) == 0xffffffff - 8
-               : ((unsigned long long)(void*)*(FlagType*)(((unsigned char*)&amp;mStorage.storage) + $T2)) == 0xffff800000000000ull - 1
+               : ((unsigned long long)(void*)*(FlagType*)(((unsigned char*)&amp;mStorage.storage) + $T2)) == 0x7fffffffffffffffull
                "/>
     <!--Used for pointers-->
     <DisplayString Optional="true" Condition="IsEmpty() || !IsEmpty()">{*this,view(TinyOptionalInplaceStorageView)}</DisplayString>

tests/NatvisTests.cpp

@@ -52,7 +52,7 @@ enum class TestEnum : unsigned long long
 {
   VALUE1,
   VALUE2,
-  INVALID = 0xffff800000000000ull - 1
+  INVALID = 0x7fff'ffff'ffff'ffffull
 };
 } // namespace