[pkg-boost-commits] r14570 - boost/trunk/debian/patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Feb 6 04:26:45 UTC 2010
Author: smr
Date: 2010-02-06 04:26:44 +0000 (Sat, 06 Feb 2010)
New Revision: 14570
Removed:
boost/trunk/debian/patches/boost-graph-printf.patch
boost/trunk/debian/patches/boost-test-invalid-read.patch
boost/trunk/debian/patches/mapped_file-header-guard.patch
Log:
Remove patches applied upstream for Boost 1.42.0
Deleted: boost/trunk/debian/patches/boost-graph-printf.patch
===================================================================
--- boost/trunk/debian/patches/boost-graph-printf.patch 2010-02-06 04:25:20 UTC (rev 14569)
+++ boost/trunk/debian/patches/boost-graph-printf.patch 2010-02-06 04:26:44 UTC (rev 14570)
@@ -1,10 +0,0 @@
---- boost1.41-1.41.0.orig/boost/graph/distributed/detail/mpi_process_group.ipp
-+++ boost1.41-1.41.0/boost/graph/distributed/detail/mpi_process_group.ipp
-@@ -28,6 +28,7 @@
- #include <queue>
- #include <stack>
- #include <boost/graph/distributed/detail/tag_allocator.hpp>
-+#include <stdio.h>
-
- // #define PBGL_PROCESS_GROUP_DEBUG
-
Deleted: boost/trunk/debian/patches/boost-test-invalid-read.patch
===================================================================
--- boost/trunk/debian/patches/boost-test-invalid-read.patch 2010-02-06 04:25:20 UTC (rev 14569)
+++ boost/trunk/debian/patches/boost-test-invalid-read.patch 2010-02-06 04:26:44 UTC (rev 14570)
@@ -1,33 +0,0 @@
-Fix for #538946
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2647
-Patch taken from http://www.nabble.com/-Boost.Test--valgrind-complains-about-invalid-reads-td20500154.html
-
-
---- boost1.40-1.40.0.orig/boost/test/impl/framework.ipp
-+++ boost1.40-1.40.0/boost/test/impl/framework.ipp
-@@ -125,12 +125,7 @@
- {
- while( !m_test_units.empty() ) {
- test_unit_store::value_type const& tu = *m_test_units.begin();
--
-- // the delete will erase this element from map
-- if( ut_detail::test_id_2_unit_type( tu.second->p_id ) == tut_suite )
-- delete static_cast<test_suite const*>(tu.second);
-- else
-- delete static_cast<test_case const*>(tu.second);
-+ delete tu.second;
- }
- }
-
---- boost1.40-1.40.0.orig/boost/test/unit_test_suite_impl.hpp
-+++ boost1.40-1.40.0/boost/test/unit_test_suite_impl.hpp
-@@ -76,8 +76,7 @@
-
- void increase_exp_fail( unsigned num );
-
--protected:
-- ~test_unit();
-+ virtual ~test_unit();
-
- private:
- // Data members
Deleted: boost/trunk/debian/patches/mapped_file-header-guard.patch
===================================================================
--- boost/trunk/debian/patches/mapped_file-header-guard.patch 2010-02-06 04:25:20 UTC (rev 14569)
+++ boost/trunk/debian/patches/mapped_file-header-guard.patch 2010-02-06 04:26:44 UTC (rev 14570)
@@ -1,18 +0,0 @@
---- boost1.41-1.41.0.orig/boost/iostreams/device/mapped_file.hpp
-+++ boost1.41-1.41.0/boost/iostreams/device/mapped_file.hpp
-@@ -4,6 +4,9 @@
- // Distributed under 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.)
-
-+#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
-+#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
-+
- #if defined(_MSC_VER) && (_MSC_VER >= 1020)
- # pragma once
- #endif
-@@ -591,3 +594,5 @@
- } } // End namespaces iostreams, boost.
-
- #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
-+
-+#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
More information about the pkg-boost-commits
mailing list