Implement resolutions of LWG 2399, 2400 and 2401.

[gcc.git] / libstdc++-v3 / include / bits / parse_numbers.h

diff --git a/libstdc++-v3/include/bits/parse_numbers.h b/libstdc++-v3/include/bits/parse_numbers.h
index 0a42381a09b62f6ba2f5c8fc363d68b43cd9805a..f46c59c44da91dc7e04c30fe9e56499163ce242c 100644 (file)
--- a/libstdc++-v3/include/bits/parse_numbers.h
+++ b/libstdc++-v3/include/bits/parse_numbers.h
@@ -190,9 +190,11 @@ namespace __parse_int
       using __digit = _Digit<_Base, _Dig>;
       using __valid_digit = typename __digit::__valid;
       using __next = _Number_help<_Base,
-                                 _Pow / (_Base * __valid_digit::value),
+                                 __valid_digit::value ? _Pow / _Base : _Pow,
                                  _Digs...>;
       using type = __ull_constant<_Pow * __digit::value + __next::type::value>;
+      static_assert((type::value / _Pow) == __digit::value,
+                   "integer literal does not fit in unsigned long long");
     };
 
   template<unsigned _Base, unsigned long long _Pow, char _Dig>
@@ -213,7 +215,6 @@ namespace __parse_int
     { };
 
 //------------------------------------------------------------------------------
-//  This _Parse_int is the same 'level' as the old _Base_dispatch.
 
   template<char... _Digs>
     struct _Parse_int;