merged from trunk

[SVN r49607]
post-review proto version
2008-11-06 00:15:47 +00:00 · 2008-04-05 18:00:00 +00:00 · 2008-02-25 11:45:51 +00:00 · 2007-11-25 21:16:46 +00:00
77 changed files with 54 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,21 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    typeof
+)
+
+# Add a library target to the build system
+boost_library_project(
+  typeof
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  #  DESCRIPTION 
+  MODULARIZED 
+  #  AUTHORS 
+  #  MAINTAINERS 
+)
+
+
--- 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,7 +153,7 @@ namespace boost
            };
        };
 # endif
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
+# 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;
@ -184,6 +184,7 @@ namespace boost
        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

@ -239,10 +240,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);

--- 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
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -0,0 +1,21 @@
+file(GLOB TEST_FILES "*.cpp")
+foreach(TEST_FILE ${TEST_FILES})
+  if (TEST_FILE MATCHES "odr.*cpp")
+    # Skip ODR tests; we'll handle them separately
+  else (TEST_FILE MATCHES "odr.*cpp")
+    get_filename_component(TEST_NAME ${TEST_FILE} NAME_WE)
+    boost_test_compile("${TEST_NAME}_native" 
+      "${TEST_NAME}.cpp" COMPILE_FLAGS "-DBOOST_TYPEOF_NATIVE")
+    boost_test_compile("${TEST_NAME}_emulation" 
+      "${TEST_NAME}.cpp" COMPILE_FLAGS "-DBOOST_TYPEOF_EMULATION")
+  endif (TEST_FILE MATCHES "odr.*cpp")
+endforeach(TEST_FILE ${TEST_FILES})
+
+boost_test_run(odr_native 
+  odr1.cpp odr2.cpp COMPILE_FLAGS "-DBOOST_TYPEOF_NATIVE")
+boost_test_run(odr_emulation
+  odr1.cpp odr2.cpp COMPILE_FLAGS "-DBOOST_TYPEOF_EMULATION")
+boost_test_run(odr_no_uns
+  odr_no_uns1.cpp odr_no_uns2.cpp 
+  COMPILE_FLAGS "-DBOOST_TYPEOF_EMULATION")
+  
--- 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
Eric Niebler	e9ae5f9e6b	merged from trunk [SVN r49607]	2008-11-06 00:15:47 +00:00
Eric Niebler	916c6eeb63	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +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