Merge lp:~michihenning/nux/937583 into lp:nux

[Michi Henning]

Fixed catch clause and removed #ifdef because it can be the same for Windows and Linux.

Removed duplicate -Werror flag from maintainer flags.

Fixed catch clause and removed #ifdef because it can be the same for Windows and Linux.

Removed duplicate -Werror flag from maintainer flags.

[Michi Henning (michihenning)]

Trivial fix only.

review: Approve

=== modified file 'NuxCore/PropertyTraits.h'
--- NuxCore/PropertyTraits.h	2011-10-02 06:43:17 +0000
+++ NuxCore/PropertyTraits.h	2012-10-02 02:06:22 +0000
@@ -86,11 +86,7 @@
     try {
       return ResultType(boost::lexical_cast<T>(serialized_form), true);
     }
-#if defined(NUX_OS_WINDOWS)
-    catch (boost::bad_lexical_cast const& ) {
-#else
-    catch (boost::bad_lexical_cast const& e) {
-#endif
+    catch (const boost::bad_lexical_cast& ) {
       return std::make_pair<T, bool>(T(), false);
     }
   }
 
=== modified file 'configure.ac'
--- configure.ac	2012-10-02 00:33:24 +0000
+++ configure.ac	2012-10-02 02:06:22 +0000
@@ -353,7 +353,7 @@
 
 AS_IF([test "x$enable_maintainer_mode" = "xyes" && test "x$GCC" = "xyes"],
       [
-         MAINTAINER_CFLAGS+="-Werror -Wall -Wextra -Werror -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
+         MAINTAINER_CFLAGS+="-Werror -Wall -Wextra -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
       ]
 )