Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]
rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back
2010-01-19 20:47:20 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-07-26 00:49:56 +00:00 · 2009-03-10 18:07:38 +00:00 · 2009-03-10 09:33:21 +00:00 · 2009-01-28 09:14:45 +00:00
75 changed files with 13 additions and 56 deletions
--- a/include/boost/typeof/dmc/typeof_impl.hpp
+++ b/include/boost/typeof/dmc/typeof_impl.hpp
--- a/include/boost/typeof/encode_decode.hpp
+++ b/include/boost/typeof/encode_decode.hpp
--- a/include/boost/typeof/encode_decode_params.hpp
+++ b/include/boost/typeof/encode_decode_params.hpp
--- a/include/boost/typeof/incr_registration_group.hpp
+++ b/include/boost/typeof/incr_registration_group.hpp
--- a/include/boost/typeof/int_encoding.hpp
+++ b/include/boost/typeof/int_encoding.hpp
--- a/include/boost/typeof/integral_template_param.hpp
+++ b/include/boost/typeof/integral_template_param.hpp
--- a/include/boost/typeof/message.hpp
+++ b/include/boost/typeof/message.hpp
--- a/include/boost/typeof/modifiers.hpp
+++ b/include/boost/typeof/modifiers.hpp
--- a/include/boost/typeof/msvc/typeof_impl.hpp
+++ b/include/boost/typeof/msvc/typeof_impl.hpp
@ -153,57 +153,7 @@ namespace boost
            };
        };
 # endif
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
-        template<const std::type_info& ref_type_info>
-        struct msvc_typeid_wrapper {
-            typedef typename msvc_extract_type<msvc_typeid_wrapper>::id2type id2type;
-            typedef typename id2type::type wrapped_type;
-            typedef typename wrapped_type::type type;
-        };
-        //This class is used for registering the type T. encode_type<T> is mapped against typeid(encode_type<T>).
-        //msvc_typeid_wrapper<typeid(encode_type<T>)> will now have a type typedef that equals encode_type<T>.
-        template<typename T>
-        struct encode_type
-        {
-            typedef encode_type<T> input_type;
-            //Invoke registration of encode_type<T>. typeid(encode_type<T>) is now mapped to encode_type<T>. Do not use registered_type for anything.
-            //The reason for registering encode_type<T> rather than T, is that VC handles typeid(function reference) poorly. By adding another
-            //level of indirection, we solve this problem.
-            typedef typename msvc_register_type<input_type,msvc_typeid_wrapper<typeid(input_type)> >::id2type registered_type;
-            typedef T type;
-        };

-        template<typename T> typename disable_if<
-            typename is_function<T>::type,
-            typename encode_type<T>::input_type>::type encode_start(T const&);
-
-        template<typename T> typename enable_if<
-            typename is_function<T>::type,
-            typename encode_type<T>::input_type>::type encode_start(T&);
-
-        template<typename Organizer, typename T>
-        msvc_register_type<T,Organizer> typeof_register_type(const T&);
-
-# define BOOST_TYPEOF(expr) \
-    boost::type_of::msvc_typeid_wrapper<typeid(boost::type_of::encode_start(expr))>::type
-
-# define BOOST_TYPEOF_TPL(expr) typename BOOST_TYPEOF(expr)
-
-# define BOOST_TYPEOF_NESTED_TYPEDEF_TPL(name,expr) \
-struct name {\
-    enum {_typeof_register_value=sizeof(typeid(boost::type_of::typeof_register_type<name>(expr)))};\
-    typedef typename boost::type_of::msvc_extract_type<name>::id2type id2type;\
-    typedef typename id2type::type type;\
-};
-
-# define BOOST_TYPEOF_NESTED_TYPEDEF(name,expr) \
-struct name {\
-    enum {_typeof_register_value=sizeof(typeid(boost::type_of::typeof_register_type<name>(expr)))};\
-    typedef boost::type_of::msvc_extract_type<name>::id2type id2type;\
-    typedef id2type::type type;\
-};
-
-# else
        template<int ID>
        struct msvc_typeid_wrapper {
            typedef typename msvc_extract_type<mpl::int_<ID> >::id2type id2type;
@ -239,10 +189,18 @@ struct name {\
        {
            typedef char(*type)[encode_type<T>::value];
        };
+# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
+        template<typename T> typename disable_if<
+            typename is_function<T>::type,
+            typename sizer<T>::type>::type encode_start(T const&);

+        template<typename T> typename enable_if<
+            typename is_function<T>::type,
+            typename sizer<T>::type>::type encode_start(T&);
+# else
        template<typename T>
            typename sizer<T>::type encode_start(T const&);
-
+# endif
        template<typename Organizer, typename T>
        msvc_register_type<T,Organizer> typeof_register_type(const T&,Organizer* =0);

@ -253,19 +211,18 @@ struct name {\

 # define BOOST_TYPEOF_NESTED_TYPEDEF_TPL(name,expr) \
    struct name {\
-        BOOST_STATIC_CONSTANT(int,_typeof_register_value=sizeof(boost::type_of::typeof_register_type<name>(expr)));\
+        enum {_typeof_register_value=sizeof(boost::type_of::typeof_register_type<name>(expr))};\
        typedef typename boost::type_of::msvc_extract_type<name>::id2type id2type;\
        typedef typename id2type::type type;\
    };

 # define BOOST_TYPEOF_NESTED_TYPEDEF(name,expr) \
    struct name {\
-        BOOST_STATIC_CONSTANT(int,_typeof_register_value=sizeof(boost::type_of::typeof_register_type<name>(expr)));\
+        enum {_typeof_register_value=sizeof(boost::type_of::typeof_register_type<name>(expr))};\
        typedef boost::type_of::msvc_extract_type<name>::id2type id2type;\
        typedef id2type::type type;\
    };

-#endif
    }
 }

--- a/include/boost/typeof/native.hpp
+++ b/include/boost/typeof/native.hpp
--- a/include/boost/typeof/pointers_data_members.hpp
+++ b/include/boost/typeof/pointers_data_members.hpp
--- a/include/boost/typeof/register_functions.hpp
+++ b/include/boost/typeof/register_functions.hpp
--- a/include/boost/typeof/register_functions_iterate.hpp
+++ b/include/boost/typeof/register_functions_iterate.hpp
--- a/include/boost/typeof/register_fundamental.hpp
+++ b/include/boost/typeof/register_fundamental.hpp
--- a/include/boost/typeof/register_mem_functions.hpp
+++ b/include/boost/typeof/register_mem_functions.hpp
--- a/include/boost/typeof/std/bitset.hpp
+++ b/include/boost/typeof/std/bitset.hpp
--- a/include/boost/typeof/std/complex.hpp
+++ b/include/boost/typeof/std/complex.hpp
--- a/include/boost/typeof/std/deque.hpp
+++ b/include/boost/typeof/std/deque.hpp
--- a/include/boost/typeof/std/fstream.hpp
+++ b/include/boost/typeof/std/fstream.hpp
--- a/include/boost/typeof/std/functional.hpp
+++ b/include/boost/typeof/std/functional.hpp
--- a/include/boost/typeof/std/iostream.hpp
+++ b/include/boost/typeof/std/iostream.hpp
--- a/include/boost/typeof/std/istream.hpp
+++ b/include/boost/typeof/std/istream.hpp
--- a/include/boost/typeof/std/iterator.hpp
+++ b/include/boost/typeof/std/iterator.hpp
--- a/include/boost/typeof/std/list.hpp
+++ b/include/boost/typeof/std/list.hpp
--- a/include/boost/typeof/std/locale.hpp
+++ b/include/boost/typeof/std/locale.hpp
--- a/include/boost/typeof/std/map.hpp
+++ b/include/boost/typeof/std/map.hpp
--- a/include/boost/typeof/std/memory.hpp
+++ b/include/boost/typeof/std/memory.hpp
--- a/include/boost/typeof/std/ostream.hpp
+++ b/include/boost/typeof/std/ostream.hpp
--- a/include/boost/typeof/std/queue.hpp
+++ b/include/boost/typeof/std/queue.hpp
--- a/include/boost/typeof/std/set.hpp
+++ b/include/boost/typeof/std/set.hpp
--- a/include/boost/typeof/std/sstream.hpp
+++ b/include/boost/typeof/std/sstream.hpp
--- a/include/boost/typeof/std/stack.hpp
+++ b/include/boost/typeof/std/stack.hpp
--- a/include/boost/typeof/std/streambuf.hpp
+++ b/include/boost/typeof/std/streambuf.hpp
--- a/include/boost/typeof/std/string.hpp
+++ b/include/boost/typeof/std/string.hpp
--- a/include/boost/typeof/std/utility.hpp
+++ b/include/boost/typeof/std/utility.hpp
--- a/include/boost/typeof/std/valarray.hpp
+++ b/include/boost/typeof/std/valarray.hpp
--- a/include/boost/typeof/std/vector.hpp
+++ b/include/boost/typeof/std/vector.hpp
--- a/include/boost/typeof/template_encoding.hpp
+++ b/include/boost/typeof/template_encoding.hpp
--- a/include/boost/typeof/template_template_param.hpp
+++ b/include/boost/typeof/template_template_param.hpp
--- a/include/boost/typeof/type_encoding.hpp
+++ b/include/boost/typeof/type_encoding.hpp
--- a/include/boost/typeof/type_template_param.hpp
+++ b/include/boost/typeof/type_template_param.hpp
--- a/include/boost/typeof/typeof.hpp
+++ b/include/boost/typeof/typeof.hpp
--- a/include/boost/typeof/typeof_impl.hpp
+++ b/include/boost/typeof/typeof_impl.hpp
--- a/include/boost/typeof/vector.hpp
+++ b/include/boost/typeof/vector.hpp
--- a/include/boost/typeof/vector100.hpp
+++ b/include/boost/typeof/vector100.hpp
--- a/include/boost/typeof/vector150.hpp
+++ b/include/boost/typeof/vector150.hpp
--- a/include/boost/typeof/vector200.hpp
+++ b/include/boost/typeof/vector200.hpp
--- a/include/boost/typeof/vector50.hpp
+++ b/include/boost/typeof/vector50.hpp
--- a/index.html
+++ b/index.html
@ -10,7 +10,7 @@ License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt)
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="../../doc/html/xpressive.html">../../doc/html/typeof.html</a>
+<a href="../../doc/html/typeof.html">../../doc/html/typeof.html</a>
 </body>
 </html>

--- a/test/data_member.cpp
+++ b/test/data_member.cpp
--- a/test/function.cpp
+++ b/test/function.cpp
--- a/test/function_binding.cpp
+++ b/test/function_binding.cpp
--- a/test/function_ptr.cpp
+++ b/test/function_ptr.cpp
--- a/test/function_ptr_from_tpl.cpp
+++ b/test/function_ptr_from_tpl.cpp
--- a/test/function_ref.cpp
+++ b/test/function_ref.cpp
--- a/test/member_function.cpp
+++ b/test/member_function.cpp
--- a/test/modifiers.cpp
+++ b/test/modifiers.cpp
--- a/test/noncopyable.cpp
+++ b/test/noncopyable.cpp
--- a/test/odr.hpp
+++ b/test/odr.hpp
--- a/test/odr1.cpp
+++ b/test/odr1.cpp
--- a/test/odr2.cpp
+++ b/test/odr2.cpp
--- a/test/odr_no_uns1.cpp
+++ b/test/odr_no_uns1.cpp
--- a/test/odr_no_uns1.hpp
+++ b/test/odr_no_uns1.hpp
--- a/test/odr_no_uns2.cpp
+++ b/test/odr_no_uns2.cpp
--- a/test/odr_no_uns2.hpp
+++ b/test/odr_no_uns2.hpp
--- a/test/std.cpp
+++ b/test/std.cpp
--- a/test/template_dependent.cpp
+++ b/test/template_dependent.cpp
--- a/test/template_enum.cpp
+++ b/test/template_enum.cpp
--- a/test/template_int.cpp
+++ b/test/template_int.cpp
--- a/test/template_multiword.cpp
+++ b/test/template_multiword.cpp
--- a/test/template_tpl.cpp
+++ b/test/template_tpl.cpp
--- a/test/template_type.cpp
+++ b/test/template_type.cpp
--- a/test/test.hpp
+++ b/test/test.hpp
--- a/test/type.cpp
+++ b/test/type.cpp
--- a/tools/preprocess.pl
+++ b/tools/preprocess.pl
@ -1,7 +1,7 @@
 # // (C) Copyright Tobias Schwinger
 # //
 # // Use modification and distribution are subject to the boost Software License
-# // Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+# // Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).

 # // Preprocess and run this script.
 # //
Author	SHA1	Message	Date
Vladimir Prus	47f0ac95c0	Branch for merging Boost.Build and Boost.Jam completely. [SVN r59143]	2010-01-19 20:47:20 +00:00
Troy D. Straszheim	b420583f9c	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	9a5663ff14	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
Peder Holt	a70cd7396a	BOOST_TYPEOF_NESTED_TYPEDEF now supports expressions containing "this" for VC compilers [SVN r51687]	2009-03-10 18:07:38 +00:00
Peder Holt	c10804f3b0	Removed use of typeid in typeof implementation for VC7.1, as this caused problems in some uses of BOOST_TYPEOF [SVN r51681]	2009-03-10 09:33:21 +00:00
Daniel James	4c9b8ba961	Fix a link in the typeof forwarding html file. [SVN r50838]	2009-01-28 09:14:45 +00:00
Michael A. Jackson	b7bfcbef45	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	2d046d3f9f	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	f2a646b417	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Tobias Schwinger	7d3afd076d	removes unnecessary escaping [SVN r43411]	2008-02-25 11:45:51 +00:00
Peder Holt	6926249653	Revert to old sizeof based solution for retrieving the type from a typeof hack. This is in order to overcome problems with the code analysis module introduced in Visual Studio 2005. [SVN r41383]	2007-11-25 21:16:46 +00:00