[Libreoffice-commits] .: cppcanvas/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Sat Oct 8 14:51:09 PDT 2011


 cppcanvas/source/mtfrenderer/textaction.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 946090359b231f55e2498dcfe4fff7294c2b9504
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Oct 8 23:46:03 2011 +0200

    Added the unreachable code back in, even for GCC 4.0, so Mac OS X would not fail.

diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 2e0f78a..4fd78a9 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2286,6 +2286,12 @@ namespace cppcanvas
                                                     rState ) );
                 }
             }
+#if defined __GNUC__
+#if __GNUC__ == 4
+            // Unreachable; to avoid bogus warning:
+            return ActionSharedPtr();
+#endif
+#endif
         }
     }
 }


More information about the Libreoffice-commits mailing list