new branch to fix documentation

[SVN r60575]

include/boost/utility/detail/result_of_iterate.hpp

@@ -10,7 +10,7 @@
 # error Boost result_of - do not include this file!
 #endif
 
-#if defined(BOOST_HAS_DECLTYPE)
+#if !defined(BOOST_NO_DECLTYPE)
 
 // As of N2588, C++0x result_of only supports function call
 // expressions of the form f(x). This precludes support for member
@@ -49,7 +49,7 @@ public:
 
 } // namespace detail 
 
-#else // defined(BOOST_HAS_DECLTYPE)
+#else // defined(BOOST_NO_DECLTYPE)
 
 // CWPro8 requires an argument in a function type specialization
 #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3002)) && BOOST_PP_ITERATION() == 0
@@ -76,7 +76,7 @@ struct result_of<F(BOOST_RESULT_OF_ARGS)>
 
 #undef BOOST_RESULT_OF_ARGS
 
-#endif // defined(BOOST_HAS_DECLTYPE)
+#endif // defined(BOOST_NO_DECLTYPE)
 
 #if BOOST_PP_ITERATION() >= 1 
 

swap/test/std_bitset.cpp

@@ -17,8 +17,8 @@
 int test_main(int, char*[])
 {
   typedef std::bitset<8> bitset_type;
-  const bitset_type initial_value1 = 1ul;
-  const bitset_type initial_value2 = 2ul;
+  const bitset_type initial_value1 = 1;
+  const bitset_type initial_value2 = 2;
 
   bitset_type object1 = initial_value1;
   bitset_type object2 = initial_value2;

test/result_of_test.cpp

@@ -133,7 +133,7 @@ int main()
 
   // Prior to decltype, result_of could not deduce the return type
   // nullary function objects unless they exposed a result_type.
-#if defined(BOOST_HAS_DECLTYPE)
+#if !defined(BOOST_NO_DECLTYPE)
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(void)>::type, int>::value));
@@ -149,7 +149,7 @@ int main()
   // result_type was defined. After decltype, result_of deduces the
   // actual return type of the function object, ignoring both
   // result<> and result_type.
-#if defined(BOOST_HAS_DECLTYPE)
+#if !defined(BOOST_NO_DECLTYPE)
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, char>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, char>::value));
 #else
@@ -181,7 +181,7 @@ int main()
   BOOST_STATIC_ASSERT((is_same<result_of<pf_t(int)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<pf_t const(int)>::type,int>::value));
 
-#if defined(BOOST_HAS_DECLTYPE)
+#if !defined(BOOST_NO_DECLTYPE)
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(double)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(void)>::type, unsigned int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_of(double)>::type, short>::value));