townforge/integer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use BOOST_STATIC_CONSTANT in static_log2, as g++ 4.0 has problems with enum.

Browse Source 
Merged revisions 54811 via svnmerge from 
https://svn.boost.org/svn/boost/trunk


[SVN r54911]
This commit is contained in:
Daniel James 2009-07-12 16:11:26 +00:00
parent 12e2311aa4
commit dcdfca5f38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/integer/static_log2.hpp
View File

@ -48,7 +48,7 @@ namespace boost {
template <result_type n>
struct choose_initial_n {
enum { c = (argument_type(1) << n << n) != 0 };
BOOST_STATIC_CONSTANT(bool, c = (argument_type(1) << n << n) != 0);
BOOST_STATIC_CONSTANT(
result_type,
value = !c*n + choose_initial_n<2*c*n>::value
@ -85,7 +85,7 @@ namespace boost {
template <argument_type x, result_type n = initial_n>
struct static_log2_impl {
enum { c = (x >> n) > 0 }; // x >= 2**n ?
BOOST_STATIC_CONSTANT(bool, c = (x >> n) > 0); // x >= 2**n ?
BOOST_STATIC_CONSTANT(
result_type,
value = c*n + (static_log2_impl< (x>>c*n), n/2 >::value)