[Libreoffice-commits] core.git: mdds/mdds_0.7.0_unreachable_warning.patch.1 mdds/UnpackedTarball_mdds.mk

[Michael Stahl]

 mdds/UnpackedTarball_mdds.mk                |    1 +
 mdds/mdds_0.7.0_unreachable_warning.patch.1 |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 96ef305d322ebf82e37ca8555a0b2573318a4fde
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 14 18:03:53 2013 +0100

    mdds: work around warning from MSVC which is a little too smart
    
    Change-Id: I26df48a24dbdd6e4363f5c08d87b6583a56da00e

diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 00da864..702086d 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
 	mdds/mdds_0.6.0.patch \
 	mdds/0001-Workaround-for-gcc-bug.patch \
+	mdds/mdds_0.7.0_unreachable_warning.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_mark_output_files,mdds,\
diff --git a/mdds/mdds_0.7.0_unreachable_warning.patch.1 b/mdds/mdds_0.7.0_unreachable_warning.patch.1
new file mode 100644
index 0000000..35819ae
--- /dev/null
+++ b/mdds/mdds_0.7.0_unreachable_warning.patch.1
@@ -0,0 +1,13 @@
+diff -ru mdds.old/include/mdds/multi_type_vector_def.inl mdds/include/mdds/multi_type_vector_def.inl
+--- mdds.old/include/mdds/multi_type_vector_def.inl	2013-03-12 21:18:16.340506918 +0100
++++ mdds/include/mdds/multi_type_vector_def.inl	2013-03-14 17:56:07.275475086 +0100
+@@ -652,7 +652,9 @@
+             }
+         }
+ 
++#ifndef _MSC_VER // MSVC is too smart and warns about unreachable code
+         assert(!"this code path should never be reached!");
++#endif
+     }
+ 
+     // This empty block is right below a non-empty block.