Revert "Try to please windows compiler"

This reverts commit a8b0e64094bd4c2cb878a70ffd5e3e9d175809a8.

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 324987c8a445e6474f0b61d8a370b5e59e3c4e15..f1cf912de53537894b3ac55e8baea48079f66dc8 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -6572,12 +6572,12 @@ void InsetTabular::getSelection(Cursor & cur,
        cs = tabular.cellColumn(beg.idx());
        ce = tabular.cellColumn(end.idx());
        if (cs > ce)
-               std::swap(cs, ce);
+               swap(cs, ce);
 
        rs = tabular.cellRow(beg.idx());
        re = tabular.cellRow(end.idx());
        if (rs > re)
-               std::swap(rs, re);
+               swap(rs, re);
 }
 
 

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index dffef8473132b179c5c369f246800d78a1a6ea6b..61d078abe0d77c51588cd64ff70e3080f5f1459a 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1295,8 +1295,8 @@ void InsetMathHull::addRow(row_type row)
        if (type_ == hullMultline) {
                if (row + 1 == nrows())  {
                        numbered_[row] = NONUMBER;
-                       std::swap(label, label_[row]);
-                       std::swap(number, numbers_[row]);
+                       swap(label, label_[row]);
+                       swap(number, numbers_[row]);
                } else
                        numbered = false;
        }
@@ -1314,9 +1314,9 @@ void InsetMathHull::swapRow(row_type row)
                return;
        if (row + 1 == nrows())
                --row;
-       std::swap(numbered_[row], numbered_[row + 1]);
-       std::swap(numbers_[row], numbers_[row + 1]);
-       std::swap(label_[row], label_[row + 1]);
+       swap(numbered_[row], numbered_[row + 1]);
+       swap(numbers_[row], numbers_[row + 1]);
+       swap(label_[row], label_[row + 1]);
        InsetMathGrid::swapRow(row);
 }
 
@@ -1326,9 +1326,9 @@ void InsetMathHull::delRow(row_type row)
        if (nrows() <= 1 || !rowChangeOK())
                return;
        if (row + 1 == nrows() && type_ == hullMultline) {
-               std::swap(numbered_[row - 1], numbered_[row]);
-               std::swap(numbers_[row - 1], numbers_[row]);
-               std::swap(label_[row - 1], label_[row]);
+               swap(numbered_[row - 1], numbered_[row]);
+               swap(numbers_[row - 1], numbers_[row]);
+               swap(label_[row - 1], label_[row]);
                InsetMathGrid::delRow(row);
                return;
        }