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
2026-02-07 15:35:38 +01:00 · 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-04-29 21:19:12 +00:00 · 2009-04-05 20:46:02 +00:00
8 changed files with 6 additions and 194 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -28,5 +28,6 @@ boostbook standalone
 #    <xsl:param>generate.section.toc.level=4
 #    <xsl:param>chunk.first.sections=7
 #    <xsl:param>toc.section.depth=10
+     <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
  ;

--- a/doc/mfc_atl.html
+++ b/doc/mfc_atl.html
@@ -291,7 +291,7 @@ ul.auto-toc {
 </head>
 <body>
 <div class="document" id="boost-range-mfc-atl-extension">
-<h1 class="title"><img alt="Boost" src="http://www.boost.org/libs/ptr_container/doc/boost.png" /> Range MFC/ATL Extension</h1>
+<h1 class="title"><img alt="Boost" src="../../ptr_container/doc/boost.png" /> Range MFC/ATL Extension</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
 <col class="docinfo-content" />
--- a/doc/upgrading.html
+++ b/doc/upgrading.html
@@ -26,7 +26,8 @@
            the new function <a
            href="boost_range.html#as_literal">as_literal()</a>.</li>
        <li><a 
-            href="boost_range.html#size">boost::size()</a> now requires a Random Access Range. The old behavior is provided as <a 
+            href="boost_range.html#size">boost::size()</a> now requires a Random
+            Access Range. The old behavior is provided as <a
            href="boost_range.html#distance">boost::distance()</a> </li>   
        <li> <code>range_size&lt;T&gt;::type</code> has been completely removed 
            in favor of <code>range_difference&lt;T&gt;::type</code>
--- a/include/boost/range/as_literal.hpp
+++ b/include/boost/range/as_literal.hpp
@@ -38,7 +38,7 @@ namespace boost
            return strlen( s );
        }

-#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
+#ifndef BOOST_NO_CWCHAR  
        inline std::size_t length( const wchar_t* s )
        {
            return wcslen( s );
@@ -61,7 +61,7 @@ namespace boost
            return true;
        }

-#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
+#ifndef BOOST_NO_CWCHAR  
        inline bool is_char_ptr( wchar_t* )
        {
            return true;
--- a/include/boost/range/detail/mfc/carray.hpp
+++ b/include/boost/range/detail/mfc/carray.hpp
@@ -1,97 +0,0 @@
-// Boost.Range library
-//
-//  Copyright Thorsten Ottosen 2003-2004. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range/
-//
-
-#if !defined( BOOST_RANGE_DETAIL_MFC_CARRAY_HPP ) && defined( BOOST_RANGE_ENABLE_MCF_CARRAY ) 
-#define BOOST_RANGE_DETAIL_MFC_CARRAY_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif
-
-#include <afxtempl.h> // for CArray
-#include <boost/range/config.hpp>
-#include <boost/range/metafunctions.hpp>
-
-namespace boost
-{
-    template< class T, class U >
-    struct range_iterator< CArray<T,U> >
-    {
-        typedef T* type;
-    };
-
-    //
-    // Why is this needed?!?
-    //
-    template< class T, class U >
-    struct range_iterator< const CArray<T,U> >
-    {
-        typedef T* type;
-    };
-
-    template< class T, class U >
-    struct range_const_iterator< CArray<T,U> >
-    {
-        typedef const T* type;
-    };
-    
-    template< class T, class U >
-    struct range_difference< CArray<T,U> >
-    {
-        typedef std::ptrdiff_t type;
-    };
-    
-    template< class T, class U >
-    struct range_size< CArray<T,U> >
-    {
-        typedef int type;
-    };
-
-    template< class T, class U >
-    struct range_value< CArray<T,U> >
-    {
-        typedef T type;
-    };
-
-    template< class T, class U >
-    T* boost_range_begin( CArray<T,U>& r )
-    {
-        return r.GetData();
-    }
-        
-    template< class T, class U >
-    const T* boost_range_begin( const CArray<T,U>& r )
-    {
-        return r.GetData();
-    }
-
-    template< class T, class U >
-    int boost_range_size( const CArray<T,U>& r )
-    {
-        return r.GetSize();
-    }
-    
-    template< class T, class U >
-    T* boost_range_end( CArray<T,U>& r )
-    {
-        return boost_range_begin( r ) + boost_range_size( r );
-    }
-        
-    template< class T, class U >
-    const T* boost_range_end( const CArray<T,U>& r )
-    {
-        return boost_range_begin( r ) + boost_range_size( r );
-    }
-
-    // default 'empty()' ok
-
-} // namespace 'boost'
-
-#endif
--- a/include/boost/range/detail/mfc/cstring.hpp
+++ b/include/boost/range/detail/mfc/cstring.hpp
@@ -1,92 +0,0 @@
-// Boost.Range library
-//
-//  Copyright Thorsten Ottosen 2003-2004. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range/
-//
-
-#if !defined(BOOST_RANGE_DETAIL_MFC_CSTRING_HPP) && defined(BOOST_RANGE_ENABLE_MFC)
-#define BOOST_RANGE_DETAIL_MFC_CSTRING_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif
-
-#include <afx.h> // for CString
-#include <boost/range/config.hpp>
-#include <boost/range/metafunctions.hpp>
-
-namespace boost
-{
-    template<>
-    struct range_iterator< CString >
-    {
-        typedef TCHAR* type;
-    };
-
-    //
-    // Why is this needed?!?
-    //
-    template<>
-    struct range_iterator< const CString >
-    {
-        typedef TCHAR* type;
-    };
-
-    template<>
-    struct range_const_iterator< CString >
-    {
-        typedef const TCHAR* type;
-    };
-
-    template<>
-    struct range_difference< CString >
-    {
-        typedef std::ptrdiff_t type;
-    };
-
-    template<>
-    struct range_size< CString >
-    {
-        typedef int type;
-    };
-
-    template<>
-    struct range_value< CString >
-    {
-        typedef TCHAR type;
-    };
-
-    TCHAR* boost_range_begin( CString& r )
-    {
-        return r.GetBuffer(0);
-    }
-        
-    const TCHAR* boost_range_begin( const CString& r )
-    {
-        return (LPCTSTR)r;
-    }
-
-    int boost_range_size( const CString& r )
-    {
-        return r.GetLength();
-    }
-    
-    TCHAR* boost_range_end( CString& r )
-    {
-        return boost_range_begin( r ) + boost_range_size( r );
-    }
-        
-    const TCHAR* range_adl_end( const CString& r )
-    {
-        return boost_range_begin( r ) + boost_range_size( r );
-    }
-
-    // default 'empty()' ok
-
-} // namespace 'boost'
-
-#endif
--- a/test/TODO
+++ b/test/TODO
@@ -1 +0,0 @@
-
--- a/test/compat1.cpp
+++ b/test/compat1.cpp
Author	SHA1	Message	Date
Vladimir Prus	6ff8e23c2e	Branch for merging Boost.Build and Boost.Jam completely. [SVN r59143]	2010-01-19 20:47:20 +00:00
Troy D. Straszheim	1461479a17	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	7663f559f2	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
Daniel James	52b9581e4f	Use local copies of the boost logo. [SVN r52666]	2009-04-29 21:19:12 +00:00
Thorsten Jørgen Ottosen	bcc0ea30cf	Ticket #2903 [SVN r52202]	2009-04-05 20:46:02 +00:00
John Maddock	837bf05867	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
Michael A. Jackson	5e7948667e	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	a65512ed5c	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