Release 1.49.0 beta 1

[SVN r76721]
Merge typo fixes from Trunk.
2012-01-27 18:03:17 +00:00 · 2011-12-26 18:08:51 +00:00 · 2011-03-31 21:41:11 +00:00
2 changed files with 2 additions and 2 deletions
--- 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
Beman Dawes	a0637336ed	Release 1.49.0 beta 1 [SVN r76721]	2012-01-27 18:03:17 +00:00
John Maddock	2f6544e54d	Merge typo fixes from Trunk. [SVN r76190]	2011-12-26 18:08:51 +00:00
Steven Watanabe	24785bf997	Merge [68802] from the trunk. [SVN r70799]	2011-03-31 21:41:11 +00:00