umfpack detection corrected and throwing destructor marked

boost/numeric/mtl/interface/umfpack_solve.hpp

@@ -52,14 +52,14 @@ namespace mtl { namespace mat {
 	template <typename Value> struct use_long { static const bool value= sizeof(Value) > sizeof(int); };
 
 	template <bool Larger> struct index_aux   { typedef int     type; };
-#     ifdef UF_long
+#if defined(UF_long)
         template<> struct index_aux<true>         { typedef UF_long type; };
-#     elif SuiteSparse_long
+#elif defined(SuiteSparse_long)
         template<> struct index_aux<true>         { typedef SuiteSparse_long type; };
-#     else
+#else
 #pragma message "cannot deduce the long umfpack type"
 	template<> struct index_aux<true>         { typedef long type; };
-#     endif
+#endif
 
 	template <typename Value> struct index 
           : index_aux<use_long<Value>::value> {};

boost/numeric/mtl/vector/vec_scal_aop_expr.hpp

@@ -44,7 +44,7 @@ struct vec_scal_aop_expr
       : first( v1 ), second( v2 ), delayed_assign( delay ), with_comma( false ), index(0)
     {}
 
-    ~vec_scal_aop_expr()
+    ~vec_scal_aop_expr() noexcept(false)
     {
 	if (!delayed_assign) {
 	    vampir_trace<2018> tracer;