creating branch to fix intrusive for Sun CC (#3339 )

[SVN r55764]
Copyrights on CMakeLists.txt to keep them from clogging up the inspect
2009-08-24 17:08:35 +00:00 · 2009-07-26 00:49:56 +00:00 · 2009-07-08 21:27:05 +00:00
3 changed files with 14 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 #----------------------------------------------------------------------------
 # This file was automatically generated from the original CMakeLists.txt file
 # Add a variable to hold the headers for the library
--- a/include/boost/integer/static_log2.hpp
+++ b/include/boost/integer/static_log2.hpp
@@ -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)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 boost_additional_test_dependencies(integer BOOST_DEPENDS test) 

 boost_test_run(cstdint_test cstdint_test.cpp)
Author	SHA1	Message	Date
Christopher Hite	36a69745d7	creating branch to fix intrusive for Sun CC (#3339 ) [SVN r55764]	2009-08-24 17:08:35 +00:00
Troy D. Straszheim	9fd48f6a56	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Daniel James	edd638ec91	Use BOOST_STATIC_CONSTANT in static_log2, as g++ 4.0 has problems with enum. [SVN r54811]	2009-07-08 21:27:05 +00:00