[Libreoffice-commits] libvisio.git: 2 commits - configure.ac src/lib

[David Tardon]

 configure.ac                    |    4 ++--
 src/lib/VSDContentCollector.cpp |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b467040741d865b97035205ac0f77986be4a0fe7
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 2 10:01:53 2017 +0200

    disable -Werror by default
    
    Change-Id: Iffc50c0ef2d3d2fd193875ded0326610eab85537

diff --git a/configure.ac b/configure.ac
index 8b7167b..b635e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,9 +233,9 @@ AS_IF([test $platform_win32 = yes],
 # Check for cflags
 # ================
 AC_ARG_ENABLE([werror],
-	[AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, useful for development])],
+	[AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
 	[enable_werror="$enableval"],
-	[enable_werror=yes]
+	[enable_werror=no]
 )
 AS_IF([test x"$enable_werror" != "xno"], [
 	CFLAGS="$CFLAGS -Werror"
commit 7789cba30b3f3a2554d8d047aad6d953a50aea3b
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 2 10:00:51 2017 +0200

    WaE: fix name collision with Boost.Spirit
    
    Change-Id: I2293dce01e402ea0798213df215989662ee44aaf

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 51484a3..26c1322 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -3555,13 +3555,13 @@ bool libvisio::VSDContentCollector::parseFormatId(const char *formatString, unsi
 
   result = 0xffff;
 
-  uint_parser<unsigned short,10,1,5> ushort_;
+  uint_parser<unsigned short,10,1,5> ushort5;
   auto first = formatString;
   const auto last = first + strlen(formatString);
   if (phrase_parse(first, last,
                    (
-                     "{<" >> ushort_ >> ">}"
-                     | "esc(" >> ushort_ >> ')'
+                     "{<" >> ushort5 >> ">}"
+                     | "esc(" >> ushort5 >> ')'
                    ),
                    space, result))
   {