[Libreoffice-commits] .: mdds/makefile.mk mdds/mdds7.unusedset.patch

[Kohei Yoshida]

 mdds/makefile.mk           |    7 +++----
 mdds/mdds7.unusedset.patch |   12 ------------
 2 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit c812cff7262d3b8725ba017c9f52420215b8e644
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Mar 28 17:05:06 2011 -0400

    Updated mdds to 0.5.2. The patch has been upstreamed.

diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 6e905ba..ed8f18b 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -36,10 +36,9 @@ TARGET=mdds
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=mdds_0.5.1
-TARFILE_MD5=5d991377b0ee1ae396c82963bc0084c1
-#http://code.google.com/p/multidimalgorithm/issues/detail?id=7
-PATCH_FILES=mdds7.unusedset.patch
+TARFILE_NAME=mdds_0.5.2
+TARFILE_MD5=7a0dcb3fe1e8c7229ab4fb868b7325e6
+PATCH_FILES=
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
diff --git a/mdds/mdds7.unusedset.patch b/mdds/mdds7.unusedset.patch
deleted file mode 100644
index 91f4802..0000000
--- a/mdds/mdds7.unusedset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/mdds_0.5.1/include/mdds/mixed_type_matrix_flag_storage.hpp	2011-02-11 15:10:29.374529418 +0000
-+++ misc/build/mdds_0.5.1/include/mdds/mixed_type_matrix_flag_storage.hpp	2011-02-11 15:10:47.517729200 +0000
-@@ -53,8 +53,7 @@
-         if (itr == m_flags.end())
-         {
-             // flag not stored for this position.
--            ::std::pair<typename flag_store_type::iterator, bool> r = 
--                m_flags.insert(typename flag_store_type::value_type(pos, flag));
-+            m_flags.insert(typename flag_store_type::value_type(pos, flag));
-             return;
-         }
-         itr->second = flag;