summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-28 17:16:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-28 17:16:21 +0000
commitdeb8773d3aedcafb32b82e3bc4a1451900120746 (patch)
treee297f5ac51e9a40ea5bd496348ae19718d1cc6e8 /boost
parent23dbfc32eaaa5fc93d306b13a2749659b45dc349 (diff)
dynamic_bitset subdir wasn't delivered
Diffstat (limited to 'boost')
-rw-r--r--boost/boost.4713.warnings.patch15
-rw-r--r--boost/makefile.mk1
2 files changed, 16 insertions, 0 deletions
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index e323c448e492..a096e378fe9e 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -851,3 +851,18 @@
hash_float_combine(seed, part);
}
+--- misc/boost_1_44_0/boost/dynamic_bitset.hpp 2011-02-28 17:10:13.892131527 +0000
++++ misc/build/boost_1_44_0/boost/dynamic_bitset/dynamic_bitset.hpp 2011-02-28 17:11:05.868726195 +0000
+@@ -1108,10 +1108,10 @@
+ // beyond the "allowed" positions
+ typedef unsigned long result_type;
+
+- const size_type max_size =
++ const size_type max_size_ =
+ (std::min)(m_num_bits, static_cast<size_type>(ulong_width));
+
+- const size_type last_block = block_index( max_size - 1 );
++ const size_type last_block = block_index( max_size_ - 1 );
+
+ assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));
+
diff --git a/boost/makefile.mk b/boost/makefile.mk
index f931ac596711..b1f054b64e67 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -98,6 +98,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional $(INCCOM)$/$(PRJNAME)