summaryrefslogtreecommitdiff
path: root/external/coinmp/UnpackedTarball_coinmp.mk
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2016-03-03 22:42:41 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2016-03-03 22:45:20 +0000
commit7df498c828b36259397e2dd2769d99e7f30f7470 (patch)
tree7132c99baa873052d027ddd41f0726ffbd56ca91 /external/coinmp/UnpackedTarball_coinmp.mk
parent70fd98f16fea0afa7b7943764b0934064dbd2c43 (diff)
Fix coinmp on MSVC 14.0
Iterator category tags carry information that can be used to select the most efficient algorithms for the specific requirement set that is implied by the category. OsiCuts defines bidirectional category tag, but doesn't implement operator--(). This is illegal: [1]. * [1] http://paste.openstack.org/show/489235 Change-Id: I68a6d297d5c33848c4b8a324e081c5118fd936a4 Reviewed-on: https://gerrit.libreoffice.org/22882 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/coinmp/UnpackedTarball_coinmp.mk')
-rw-r--r--external/coinmp/UnpackedTarball_coinmp.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 468589b47d12..98d544034ff4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
$(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
+ external/coinmp/osi_cuts_iterator.patch.0 \
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \