Compare commits

...

3 Commits

Author SHA1 Message Date
Beman Dawes
37e08acf0b Release 1.37.0
[SVN r51178]
2009-02-10 13:14:42 +00:00
Troy D. Straszheim
b7eedd0f46 merge of cmake build files from trunk per beman
[SVN r50756]
2009-01-24 18:57:20 +00:00
Gennaro Prota
16ca9cbb3c dynamic_bitset: ported revisions 49433, 49586 from trunk
[SVN r50470]
2009-01-04 23:03:28 +00:00
5 changed files with 42 additions and 22 deletions

24
CMakeLists.txt Normal file
View File

@@ -0,0 +1,24 @@
#----------------------------------------------------------------------------
# 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

@@ -20,19 +20,13 @@
# define BOOST_OLD_IOSTREAMS
#endif
// this should be in the config system some day
// see http://lists.boost.org/MailArchives/boost/msg62291.php
#define BOOST_DYNAMIC_BITSET_GNUC_VERSION ( (__GNUC__) * 100 * 100 \
+ (__GNUC_MINOR__) * 100)
// no-op function to workaround gcc bug c++/8419
//
namespace boost { namespace detail {
template <typename T> T make_non_const(T t) { return t; }
}}
#if defined(__GNUC__) && BOOST_WORKAROUND(BOOST_DYNAMIC_BITSET_GNUC_VERSION, \
BOOST_TESTED_AT(30300))
#if defined(__GNUC__)
# define BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(expr) \
(boost::detail::make_non_const(expr))
#else

View File

@@ -476,24 +476,18 @@ BOOST_DYNAMIC_BITSET_PRIVATE:
};
#if defined(__IBMCPP__) && BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
#if !defined BOOST_NO_INCLASS_MEMBER_INITIALIZATION
// Workaround for IBM's AIX platform.
// See http://comments.gmane.org/gmane.comp.lib.boost.user/15331
//
// NOTE:
// The compiler is actually right, until core issue 454 will be settled:
// <http://www.open-std.org/JTC1/SC22/WG21/docs/cwg_active.html#454>
//
// It's arguable whether we want to mark this with BOOST_WORKAROUND or not.
template<typename Block, typename Allocator>
dynamic_bitset<Block, Allocator>::block_width_type const
template <typename Block, typename Allocator>
const typename dynamic_bitset<Block, Allocator>::block_width_type
dynamic_bitset<Block, Allocator>::bits_per_block;
template<typename Block, typename Allocator>
dynamic_bitset<Block, Allocator>::block_width_type const
template <typename Block, typename Allocator>
const typename dynamic_bitset<Block, Allocator>::size_type
dynamic_bitset<Block, Allocator>::npos;
template <typename Block, typename Allocator>
const typename dynamic_bitset<Block, Allocator>::block_width_type
dynamic_bitset<Block, Allocator>::ulong_width;
#endif

1
module.cmake Normal file
View File

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

7
test/CMakeLists.txt Normal file
View File

@@ -0,0 +1,7 @@
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)