/////////////////////////////////////////////////////////////////////////
MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
- : bv(b), font(move(f)), fontname("mathnormal"),
+ : bv(b), font(std::move(f)), fontname("mathnormal"),
textwidth(w), macro_nesting(0),
solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
{
#if __cplusplus >= 201402L
return rc;
#else
- return move(rc);
+ /** In theory, this is not needed with C++11, and modern compilers
+ * will complain in C++11 mode, but gcc 4.9 requires this. */
+ return std::move(rc);
#endif
}