Create branches/filesystem-v3 for v2 removal

[SVN r77385]
Apply patch from Vincent Botet Escriba: fix check for size > long long.
2025-06-27 04:51:36 +02:00 · 2012-03-18 20:54:17 +00:00 · 2012-02-24 16:57:13 +00:00 · 2011-12-24 17:29:03 +00:00 · 2011-02-12 15:06:21 +00:00 · 2011-01-13 13:43:08 +00:00
9 changed files with 14 additions and 73 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -50,7 +50,6 @@ boostbook standalone
        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/regex/doc/html
    ;

-install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
-explicit pdfinstall ;
+install pdf-install : standalone : <location>. <install-type>PDF ;


--- a/include/boost/integer.hpp
+++ b/include/boost/integer.hpp
@ -20,7 +20,6 @@
 #include <boost/integer_traits.hpp>  // for boost::::boost::integer_traits
 #include <boost/limits.hpp>          // for ::std::numeric_limits
 #include <boost/cstdint.hpp>         // for boost::int64_t and BOOST_NO_INTEGRAL_INT64_T
-#include <boost/static_assert.hpp>

 //
 // We simply cannot include this header on gcc without getting copious warnings of the kind:
@ -52,7 +51,6 @@ namespace boost

  //  convert category to type 
  template< int Category > struct int_least_helper {}; // default is empty
-  template< int Category > struct uint_least_helper {}; // default is empty

  //  specializatons: 1=long, 2=int, 3=short, 4=signed char,
  //     6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned char
@ -67,14 +65,14 @@ namespace boost
  template<> struct int_least_helper<4> { typedef short least; };
  template<> struct int_least_helper<5> { typedef signed char least; };
 #ifdef BOOST_HAS_LONG_LONG
-  template<> struct uint_least_helper<1> { typedef boost::ulong_long_type least; };
+  template<> struct int_least_helper<6> { typedef boost::ulong_long_type least; };
 #elif defined(BOOST_HAS_MS_INT64)
-  template<> struct uint_least_helper<1> { typedef unsigned __int64 least; };
+  template<> struct int_least_helper<6> { typedef unsigned __int64 least; };
 #endif
-  template<> struct uint_least_helper<2> { typedef unsigned long least; };
-  template<> struct uint_least_helper<3> { typedef unsigned int least; };
-  template<> struct uint_least_helper<4> { typedef unsigned short least; };
-  template<> struct uint_least_helper<5> { typedef unsigned char least; };
+  template<> struct int_least_helper<7> { typedef unsigned long least; };
+  template<> struct int_least_helper<8> { typedef unsigned int least; };
+  template<> struct int_least_helper<9> { typedef unsigned short least; };
+  template<> struct int_least_helper<10> { typedef unsigned char least; };

  template <int Bits>
  struct exact_signed_base_helper{};
@ -113,8 +111,6 @@ namespace boost
  template< int Bits >   // bits (including sign) required
  struct int_t : public detail::exact_signed_base_helper<Bits>
  {
-      BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::intmax_t) * CHAR_BIT),
-         "No suitable signed integer type with the requested number of bits is available.");
      typedef typename detail::int_least_helper
        <
 #ifdef BOOST_HAS_LONG_LONG
@ -134,8 +130,6 @@ namespace boost
  template< int Bits >   // bits required
  struct uint_t : public detail::exact_unsigned_base_helper<Bits>
  {
-     BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::uintmax_t) * CHAR_BIT),
-         "No suitable unsigned integer type with the requested number of bits is available.");
 #if (defined(__BORLANDC__) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T)
     // It's really not clear why this workaround should be needed... shrug I guess!  JM
     BOOST_STATIC_CONSTANT(int, s = 
@ -146,8 +140,9 @@ namespace boost
          (Bits <= ::std::numeric_limits<unsigned char>::digits));
     typedef typename detail::int_least_helper< ::boost::uint_t<Bits>::s>::least least;
 #else
-      typedef typename detail::uint_least_helper
+      typedef typename detail::int_least_helper
        < 
+          5 +
 #ifdef BOOST_HAS_LONG_LONG
          (Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
 #else
@ -222,7 +217,7 @@ namespace boost
     // It's really not clear why this workaround should be needed... shrug I guess!  JM
 #if defined(BOOST_NO_INTEGRAL_INT64_T)
      BOOST_STATIC_CONSTANT(unsigned, which = 
-           1 +
+           6 +
          (MaxValue <= ::boost::integer_traits<unsigned long>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned int>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned short>::const_max) +
@ -230,17 +225,18 @@ namespace boost
      typedef typename detail::int_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least;
 #else // BOOST_NO_INTEGRAL_INT64_T
      BOOST_STATIC_CONSTANT(unsigned, which = 
-           1 +
+           5 +
          (MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned long>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned int>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned short>::const_max) +
          (MaxValue <= ::boost::integer_traits<unsigned char>::const_max));
-      typedef typename detail::uint_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least;
+      typedef typename detail::int_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least;
 #endif // BOOST_NO_INTEGRAL_INT64_T
 #else
-      typedef typename detail::uint_least_helper
+      typedef typename detail::int_least_helper
        < 
+          5 +
 #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
          (MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) +
 #else
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -22,10 +22,4 @@ test-suite integer
        [ compile static_log2_include_test.cpp ]
        [ compile static_min_max_include_test.cpp ]
        [ compile integer_fwd_include_test.cpp ]
-        [ compile-fail fail_int_exact.cpp ]
-        [ compile-fail fail_int_fast.cpp ]
-        [ compile-fail fail_int_least.cpp ]
-        [ compile-fail fail_uint_exact.cpp ]
-        [ compile-fail fail_uint_fast.cpp ]
-        [ compile-fail fail_uint_least.cpp ]
    ;
--- a/test/fail_int_exact.cpp
+++ b/test/fail_int_exact.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::int_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::exact fail_int_exact;
--- a/test/fail_int_fast.cpp
+++ b/test/fail_int_fast.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::int_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::fast fail_int_fast;
--- a/test/fail_int_least.cpp
+++ b/test/fail_int_least.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::int_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::least fail_int_least;
--- a/test/fail_uint_exact.cpp
+++ b/test/fail_uint_exact.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::uint_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::exact fail_uint_exact;
--- a/test/fail_uint_fast.cpp
+++ b/test/fail_uint_fast.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::uint_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::fast fail_uint_fast;
--- a/test/fail_uint_least.cpp
+++ b/test/fail_uint_least.cpp
@ -1,8 +0,0 @@
-//  Copyright John Maddock 2012.  
-//  Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/integer.hpp>
-
-typedef boost::uint_t<sizeof(boost::intmax_t)*CHAR_BIT + 1>::least fail_uint_least;
Author	SHA1	Message	Date
Beman Dawes	2536a131ce	Create branches/filesystem-v3 for v2 removal [SVN r77385]	2012-03-18 20:54:17 +00:00
John Maddock	1898e66238	Apply patch from Vincent Botet Escriba: fix check for size > long long. [SVN r77109]	2012-02-24 16:57:13 +00:00
John Maddock	cc73477d13	Fix typo. Refs #6003. [SVN r76137]	2011-12-24 17:29:03 +00:00
Steven Watanabe	8457bd01b1	Fix integer_traits<long long> when no macro from limits.h is available. [SVN r68802]	2011-02-12 15:06:21 +00:00
John Maddock	707faa1086	Remove old dead code. [SVN r68097]	2011-01-13 13:43:08 +00:00
John Maddock	7bd48eb3f3	Change logic so that int32_t etc is an int rather than a long where possible. [SVN r65299]	2010-09-05 16:27:09 +00:00
John Maddock	7c62277986	Add VMS support. Fixes #4474. [SVN r64750]	2010-08-12 12:36:42 +00:00
Daniel James	8368cd0a55	Rebuild integer docs. [SVN r63765]	2010-07-08 20:50:29 +00:00
Daniel James	794fdf9bad	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Steven Watanabe	cd98c4a257	Add a 64 bit specialization of low_bits_mask_t. Fixes #4332 [SVN r62756]	2010-06-10 19:49:34 +00:00
Daniel James	84c8a52085	Rebuild the integer documentation. [SVN r61058]	2010-04-05 07:27:25 +00:00
Daniel James	8a1d11f369	Fix link to integer header. [SVN r59676]	2010-02-14 13:09:24 +00:00
John Maddock	a5356bb254	Change integer code to still work when BOOST_HAS_MS_INT64 is defined but BOOST_HAS_LONG_LONG is not. Update VC++ config to define BOOST_HAS_LONG_LONG for MSVC-8 in ANSI mode. Fixes #3657. [SVN r59468]	2010-02-04 11:15:54 +00:00
John Maddock	2f13159023	Change code to check individually for the INT#_C macros before defining them - this correctly handles cases where they are partially defined by other other headers (for example ICU). Also declare this a gcc system header - seems to be the only way to really suppress the warnings - fixes #3889. [SVN r59430]	2010-02-02 18:35:33 +00:00
John Maddock	6293af825a	Commit alternative warning suppression code. [SVN r59264]	2010-01-25 10:55:50 +00:00
Daniel James	896f2a7654	Disable warnings when defining INT#_C macros for gcc. [SVN r58948]	2010-01-12 18:51:40 +00:00