Branch for adding initializer list support (only in the unreleased gcc 4.4 at the moment).

[SVN r48931]
2008-09-23 19:45:43 +00:00
6 changed files with 8 additions and 44 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,21 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    tuple
-)
-
-# Add a library target to the build system
-boost_library_project(
-  tuple
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "Ease definition of functions returning multiple values, and more."
-  MODULARIZED 
-  AUTHORS  "Jaakko Jarvi <jarvi -at- cs.tamu.edu>"
-  #  MAINTAINERS 
-)
-
-
--- a/doc/tuple_advanced_interface.html
+++ b/doc/tuple_advanced_interface.html
@ -2,13 +2,14 @@
 <html>
  <head>
    <title>Tuple library advanced features</title>
-  </head>
-
 <body bgcolor="#FFFFFF" text="#000000">

 <IMG SRC="../../../boost.png" 
     ALT="C++ Boost" width="277" height="86">

+  </head>
+
+  <body>
    <h1>Tuple library advanced features</h1>

 The advanced features described in this document are all under namespace <code>::boost::tuples</code>
--- a/include/boost/tuple/detail/tuple_basic.hpp
+++ b/include/boost/tuple/detail/tuple_basic.hpp
@ -213,7 +213,7 @@ struct element_impl<0, T, true /* IsConst */>


 template<int N, class T>
-struct element:
+struct element: 
  public detail::element_impl<N, T, ::boost::is_const<T>::value>
 {
 };
@ -488,20 +488,11 @@ struct length<tuple<> > {
  BOOST_STATIC_CONSTANT(int, value = 0);
 };

-template<>
-struct length<tuple<> const> {
-  BOOST_STATIC_CONSTANT(int, value = 0);
-};
-
 template<>
 struct length<null_type> {
  BOOST_STATIC_CONSTANT(int, value = 0);
 };

-template<>
-struct length<null_type const> {
-  BOOST_STATIC_CONSTANT(int, value = 0);
-};

 namespace detail {

--- a/include/boost/tuple/tuple_comparison.hpp
+++ b/include/boost/tuple/tuple_comparison.hpp
@ -69,8 +69,8 @@ inline bool neq<null_type,null_type>(const null_type&, const null_type&) { retur
 template<class T1, class T2>
 inline bool lt(const T1& lhs, const T2& rhs) {
  return lhs.get_head() < rhs.get_head()  ||
-          ( !(rhs.get_head() < lhs.get_head()) &&
-            lt(lhs.get_tail(), rhs.get_tail()));
+            !(rhs.get_head() < lhs.get_head()) &&
+            lt(lhs.get_tail(), rhs.get_tail());
 }
 template<>
 inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return false; }
@ -78,8 +78,8 @@ inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return
 template<class T1, class T2>
 inline bool gt(const T1& lhs, const T2& rhs) {
  return lhs.get_head() > rhs.get_head()  ||
-          ( !(rhs.get_head() > lhs.get_head()) &&
-            gt(lhs.get_tail(), rhs.get_tail()));
+            !(rhs.get_head() > lhs.get_head()) &&
+            gt(lhs.get_tail(), rhs.get_tail());
 }
 template<>
 inline bool gt<null_type,null_type>(const null_type&, const null_type&) { return false; }
--- a/module.cmake
+++ b/module.cmake
@ -1,2 +0,0 @@
-boost_module(tuple DEPENDS static_assert)
-
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,5 +0,0 @@
-boost_additional_test_dependencies(tuple BOOST_DEPENDS test)
-
-
-boost_test_run(tuple_test_bench DEPENDS boost_test_exec_monitor)
-boost_test_run(io_test DEPENDS boost_test_exec_monitor)