Quickbook: Merge from trunk.

Includes blocks in lists fixes, and some documentation changes. [SVN r77347]
Quickbook: Merge from trunk to quickbook-dev.
2026-01-19 16:22:19 +00:00 · 2012-03-16 08:48:10 +00:00 · 2012-01-01 13:35:27 +00:00 · 2011-03-27 10:17:05 +00:00 · 2011-02-12 15:06:21 +00:00 · 2011-01-13 13:43:08 +00:00
3 changed files with 4 additions and 4 deletions
--- a/include/boost/integer.hpp
+++ b/include/boost/integer.hpp
@@ -114,7 +114,7 @@ namespace boost
      typedef typename detail::int_least_helper
        <
 #ifdef BOOST_HAS_LONG_LONG
-          (Bits-1 <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
+          (Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
 #else
           1 +
 #endif
@@ -144,7 +144,7 @@ namespace boost
        < 
          5 +
 #ifdef BOOST_HAS_LONG_LONG
-          (Bits-1 <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
+          (Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
 #else
           1 +
 #endif
--- a/include/boost/integer_traits.hpp
+++ b/include/boost/integer_traits.hpp
@@ -227,7 +227,7 @@ class integer_traits< ::boost::ulong_long_type>
 template<>
 class integer_traits< ::boost::long_long_type>
  : public std::numeric_limits< ::boost::long_long_type>,
-    public detail::integer_traits_base< ::boost::long_long_type, (1LL << (sizeof(::boost::long_long_type) - 1)), ~(1LL << (sizeof(::boost::long_long_type) - 1))>
+    public detail::integer_traits_base< ::boost::long_long_type, (1LL << (sizeof(::boost::long_long_type) * CHAR_BIT - 1)), ~(1LL << (sizeof(::boost::long_long_type) * CHAR_BIT - 1))>
 { };

 template<>
--- a/test/integer_test.cpp
+++ b/test/integer_test.cpp
@@ -152,7 +152,7 @@ void do_test_bits()
   if(boost::detail::test_errors() != last_error_count)
   {
      last_error_count = boost::detail::test_errors();
-      std::cout << "Errors occured while testing with bit count = " << Bits << std::endl;
+      std::cout << "Errors occurred while testing with bit count = " << Bits << std::endl;
      std::cout << "Type int_t<" << Bits << ">::least was " << get_name_of_type(least_int(0)) << std::endl;
      std::cout << "Type int_t<" << Bits << ">::fast was " << get_name_of_type(fast_int(0)) << std::endl;
      std::cout << "Type uint_t<" << Bits << ">::least was " << get_name_of_type(least_uint(0)) << std::endl;
Author	SHA1	Message	Date
Daniel James	3dbf187bc5	Quickbook: Merge from trunk. Includes blocks in lists fixes, and some documentation changes. [SVN r77347]	2012-03-16 08:48:10 +00:00
Daniel James	45507789ef	Quickbook: Merge from trunk to quickbook-dev. [SVN r76255]	2012-01-01 13:35:27 +00:00
Daniel James	e25450f5a0	Quickbook: New branch for development. From now on this will be my development branch. [SVN r70613]	2011-03-27 10:17:05 +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