X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_sizeinset.C;h=b6e3a8176914f88ee7310b0d6946ce333129d477;hb=07cc9f67534474b167ca1ea727bda643fdd8d197;hp=1e744835c90a5c817858c1070c6e95d8cd15d1c9;hpb=1f9e9cf5173fa1fbafdff5f21080e5194b05818b;p=lyx.git

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 1e744835c9..b6e3a81769 100644
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -11,13 +11,16 @@
 #include <config.h>
 
 #include "math_sizeinset.h"
-#include "math_parser.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "math_parser.h"
 #include "math_streamstr.h"
-#include "math_support.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
+#ifndef CXX_GLOBAL_CSTD
 using std::atoi;
+#endif
+
 using std::auto_ptr;
 
 
@@ -35,9 +38,9 @@ auto_ptr<InsetBase> MathSizeInset::clone() const
 void MathSizeInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	StyleChanger dummy(mi.base, style_);
-	cell(0).metrics(mi, dim_);
-	metricsMarkers();
-	dim = dim_;
+	cell(0).metrics(mi, dim);
+	metricsMarkers(dim);
+	dim_ = dim;
 }