[Libreoffice-commits] .: boost/boost.4713.warnings.patch boost/makefile.mk

[Caolán McNamara]

 boost/boost.4713.warnings.patch |   15 +++++++++++++++
 boost/makefile.mk               |    1 +
 2 files changed, 16 insertions(+)

New commits:
commit 9913161d6e3fb33ffe51eabd4a2fa85aad2562ca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 28 17:16:21 2011 +0000

    dynamic_bitset subdir wasn't delivered

diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index e323c44..a096e37 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 f931ac5..b1f054b 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)