strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix coinmp on MSVC 14.0

Browse source 
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>
This commit is contained in:
David Ostrovsky 2016-03-03 22:42:41 +01:00
parent 70fd98f16f
commit 7df498c828
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
external/coinmp/UnpackedTarball_coinmp.mk vendored
View file

@ -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 \

12
external/coinmp/osi_cuts_iterator.patch.0 vendored Executable file
View file

@ -0,0 +1,12 @@
diff -ru coinmp.orig/Osi/src/Osi/OsiCuts.hpp coinmp/Osi/src/Osi/OsiCuts.hpp
--- Osi/src/Osi/OsiCuts.hpp 2011-06-13 17:08:11.000000000 +0200
+++ Osi/src/Osi/OsiCuts.hpp 2016-03-03 22:21:04.669838200 +0100
@@ -74,7 +74,7 @@
class const_iterator {
friend class OsiCuts;
public:
- typedef std::bidirectional_iterator_tag iterator_category;
+ typedef std::forward_iterator_tag iterator_category;
typedef OsiCut* value_type;
typedef size_t difference_type;
typedef OsiCut ** pointer;