Merge remote-tracking branch 'origin/master' into travis

dune/stuff/common/string_internal.hh

@@ -338,7 +338,7 @@ static inline typename std::enable_if<!is_vector<T>::value && !is_matrix<T>::val
 to_string(const T& ss, const std::size_t precision)
 {
   std::ostringstream out;
-  out << std::setprecision(precision) << ss;
+  out << std::setprecision(boost::numeric_cast<int>(precision)) << ss;
   return out.str();
 }
 

dune/stuff/test/common_string.cc

@@ -166,10 +166,7 @@ TEST(StringTest, ConvertFrom)
 // Hex, whitespacify, tokenize, stringFromTime tests
 TEST(StringTest, Hex)
 {
-// disabled the following test for Intel anc clang compiler because it causes compilation failures for no obvious reason
-#if !(defined __INTEL_COMPILER || BOOST_CLANG)
-  EXPECT_GT(boost::lexical_cast<HexToString<unsigned long>>(cout), 0u);
-#endif
+  EXPECT_GT(boost::lexical_cast<HexToString<unsigned long>>(&cout), 0u);
   EXPECT_EQ(boost::lexical_cast<HexToString<unsigned long>>("0x00000F"), 15u);
 }