Branch at revision 46530

[SVN r46531]

build/Jamfile

@@ -6,25 +6,31 @@
 
 # Generates preprocessed files with wave.
 
-actions wave
-{
-  $(>[1]) -S../../.. $(>[2]) -o $(<)
+rule wave 
+{ 
+  Depends $1 : $2 ; 
 }
 
-W = ../../../tools/wave/build//wave ;
+actions wave
+{
+  ../../../dist/bin/wave -S../../.. $(>) -o $(<)
+}
 
-make arity_loops
-  : preprocess_arity_loops.cpp $(W) : wave : <location>build/timestamps
+make ../../../libs/function_types/build/timestamps/arity_loops
+  : preprocess_arity_loops.cpp : wave 
   ;
 
-make encoding
-  : preprocess_encoding.cpp $(W) : wave : <location>build/timestamps
+explicit ../../../libs/function_types/build/timestamps/arity_loops ; 
+
+make ../../../libs/function_types/build/timestamps/encoding
+  : preprocess_encoding.cpp : wave 
   ;
 
+explicit ../../../libs/function_types/build/timestamps/encoding ;
 
-make cc_names
-  : preprocess_cc_names.cpp $(W) : wave : <location>build/timestamps
+make ../../../libs/function_types/build/timestamps/cc_names
+  : preprocess_cc_names.cpp : wave
   ;
-  
-explicit arity_loops encoding cc_names ;
+
+explicit ../../../libs/function_types/build/timestamps/cc_names ;
 

test/decomposition/result_type.cpp

@@ -16,19 +16,12 @@ namespace ft = boost::function_types;
 
 class C; 
 typedef C func();
-typedef C const c_func();
 typedef C (*func_ptr)();
-typedef C const (*c_func_ptr)();
 typedef C (&func_ref)();
-typedef C const (&c_func_ref)();
 typedef C (C::*mem_func_ptr)();
-typedef C const (C::*c_mem_func_ptr)();
-typedef C (C::*mem_func_ptr_c)() const;
-typedef C const (C::*c_mem_func_ptr_c)() const;
-typedef C (C::*mem_func_ptr_v)() volatile;
-typedef C const (C::*c_mem_func_ptr_v)() volatile;
-typedef C (C::*mem_func_ptr_cv)() const volatile;
-typedef C const (C::*c_mem_func_ptr_cv)() const volatile;
+typedef C (C::*c_mem_func_ptr)() const;
+typedef C (C::*v_mem_func_ptr)() volatile;
+typedef C (C::*cv_mem_func_ptr)() const volatile;
 typedef int C::* mem_ptr;
 typedef int const C::* c_mem_ptr;
 
@@ -36,56 +29,28 @@ BOOST_MPL_ASSERT((
   boost::is_same<ft::result_type<func>::type,C>
 ));
 
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_func>::type,C const>
-));
-
 BOOST_MPL_ASSERT((
   boost::is_same<ft::result_type<func_ptr>::type,C>
 ));
 
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_func_ptr>::type,C const>
-));
-
 BOOST_MPL_ASSERT((
   boost::is_same<ft::result_type<func_ref>::type,C>
 ));
 
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_func_ref>::type,C const>
-));
-
 BOOST_MPL_ASSERT((
   boost::is_same<ft::result_type<mem_func_ptr>::type,C>
 ));
 
 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_mem_func_ptr>::type,C const>
+  boost::is_same<ft::result_type<c_mem_func_ptr>::type,C>
 ));
 
 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<mem_func_ptr_c>::type,C>
+  boost::is_same<ft::result_type<v_mem_func_ptr>::type,C>
 ));
 
 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_mem_func_ptr_c>::type,C const>
-));
-
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<mem_func_ptr_v>::type,C>
-));
-
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_mem_func_ptr_v>::type,C const>
-));
-
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<mem_func_ptr_cv>::type,C>
-));
-
-BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_mem_func_ptr_cv>::type,C const>
+  boost::is_same<ft::result_type<cv_mem_func_ptr>::type,C>
 ));
 
 BOOST_MPL_ASSERT((