Merge branch 'work' into tests

Author: oktonion

stdex/include/cstdint.hpp

@@ -370,7 +370,7 @@ namespace stdex
         template<class _Unsigned, int _Size>
         struct _sized_integer_umax_impl
         {
-            char _sized_integer_umax_size_is_invalid_assert[_Size > 0 ? 1 : (sizeof(_Unsigned) / sizeof(_Unsigned) - 3)]; // should never ever happen!
+            char _sized_integer_umax_size_is_invalid_assert[_Size > 0 ? 1 : ((sizeof(_Unsigned) + 1) / sizeof(_Unsigned) - 3)]; // should never ever happen!
             static const _Unsigned umax_value = _Size > 0 ? (((_Unsigned(1) << (_Size - 1)) - 1) * _Unsigned(2) + _Unsigned(1)) : 0;
         };
 

stdex/include/string.hpp

@@ -210,7 +210,7 @@ namespace stdex
                 if(errno == 0 && _str_to_integral_chooser_impl::check(value)) 
                 {
                     ptrdiff_t length = 
-                        endptr ? (*endptr - str) : (str - str + strlen(str));
+                        endptr ? (*endptr - str) : (str + strlen(str) - str);
                     string positive_str(str, str + length);
                     bool is_negative = (value == LONG_MIN);
 
@@ -256,7 +256,7 @@ namespace stdex
                 if(errno == 0 && _str_to_integral_chooser_impl::check(value)) 
                 {
                     ptrdiff_t length = 
-                        endptr ? (*endptr - str) : (str - str + wcslen(str));
+                        endptr ? (*endptr - str) : (str + wcslen(str) - str);
                     wstring positive_str(str, str + length);
                     bool is_negative = (value == LONG_MIN);