Compare commits

...

5 Commits

Author SHA1 Message Date
Beman Dawes
7e7834dc98 Release 1.41.0
[SVN r57747]
2009-11-18 14:58:26 +00:00
Troy D. Straszheim
d77a2c4afa rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release.
[SVN r56941]
2009-10-17 01:10:45 +00:00
Troy D. Straszheim
e3a2ca7276 Add basic copyright/license to keep cmake out of the inspection report
[SVN r55095]
2009-07-22 21:51:01 +00:00
Daniel James
38819630fd Merge dynamic bitset fixes for gcc 4.3.3.
Merged revisions 52879-52881,53050 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r52879 | hkaiser | 2009-05-10 17:52:14 +0100 (Sun, 10 May 2009) | 1 line
  
  Applying patch fixing problem on certain patch levels for gcc.4.3.3/Ubuntu
........
  r52880 | hkaiser | 2009-05-10 17:55:07 +0100 (Sun, 10 May 2009) | 1 line
  
  Fixing the fix by taking into account __GNUC_PATCHLEVEL__ as well
........
  r52881 | hkaiser | 2009-05-10 17:59:27 +0100 (Sun, 10 May 2009) | 1 line
  
  Minor comment edit
........
  r53050 | danieljames | 2009-05-16 15:58:33 +0100 (Sat, 16 May 2009) | 13 lines
  
  Merge dynamic bitset from release.
  
  I think the recent changes in trunk and release were for the same problem. But
  I'm not sure so I've merged them together. Hopefully, the release branch might
  fix the Intel C++ errors as well.
  
  ------------------------------------------------------------------------
  r52960 | dgregor | 2009-05-13 07:11:03 +0100 (Wed, 13 May 2009) | 1 line
  
  Use enum constants rather than local variables for integral constants. Should fix dynamic_bitset failures on GCC 4.3.x
  ------------------------------------------------------------------------
........


[SVN r53259]
2009-05-25 20:26:02 +00:00
Douglas Gregor
6d0f9801f5 Use enum constants rather than local variables for integral constants. Should fix dynamic_bitset failures on GCC 4.3.x
[SVN r52960]
2009-05-13 06:11:03 +00:00
4 changed files with 12 additions and 38 deletions

View File

@@ -1,24 +0,0 @@
#----------------------------------------------------------------------------
# This file was automatically generated from the original CMakeLists.txt file
# Add a variable to hold the headers for the library
set (lib_headers
dynamic_bitset.hpp
dynamic_bitset_fwd.hpp
dynamic_bitset
)
# Add a library target to the build system
boost_library_project(
dynamic_bitset
# SRCDIRS
TESTDIRS test
HEADERS ${lib_headers}
# DOCDIRS
DESCRIPTION "A runtime-sized version of std::bitset"
MODULARIZED
AUTHORS "Jeremy Siek <jeremy.siek -at- gmail.com>"
"Chuck Allison"
# MAINTAINERS
)

View File

@@ -999,20 +999,26 @@ dynamic_bitset<Block, Allocator>::count() const
using detail::dynamic_bitset_impl::access_by_blocks;
using detail::dynamic_bitset_impl::value_to_type;
#if BOOST_WORKAROUND(__GNUC__, == 4) && (__GNUC_MINOR__ == 3) && (__GNUC_PATCHLEVEL__ == 3)
// NOTE: Explicit qualification of "bits_per_block"
// breaks compilation on gcc 4.3.3
enum { no_padding = bits_per_block == CHAR_BIT * sizeof(Block) };
#else
// NOTE: Explicitly qualifying "bits_per_block" to workaround
// regressions of gcc 3.4.x
const bool no_padding =
enum { no_padding =
dynamic_bitset<Block, Allocator>::bits_per_block
== CHAR_BIT * sizeof(Block);
== CHAR_BIT * sizeof(Block) };
#endif
const bool enough_table_width = table_width >= CHAR_BIT;
enum { enough_table_width = table_width >= CHAR_BIT };
const bool mode = (no_padding && enough_table_width)
enum { mode = (no_padding && enough_table_width)
? access_by_bytes
: access_by_blocks;
: access_by_blocks };
return do_count(m_bits.begin(), num_blocks(), Block(0),
static_cast<value_to_type<mode> *>(0));
static_cast<value_to_type<(bool)mode> *>(0));
}

View File

@@ -1 +0,0 @@
boost_module(dynamic_bitset DEPENDS detail static_assert)

View File

@@ -1,7 +0,0 @@
boost_additional_test_dependencies(dynamic_bitset BOOST_DEPENDS test config)
boost_test_run(dyn_bitset_unit_tests1 ../dyn_bitset_unit_tests1.cpp)
boost_test_run(dyn_bitset_unit_tests2 ../dyn_bitset_unit_tests2.cpp)
boost_test_run(dyn_bitset_unit_tests3 ../dyn_bitset_unit_tests3.cpp)
boost_test_run(dyn_bitset_unit_tests4 ../dyn_bitset_unit_tests4.cpp)