Revert "Always remove selection after cursor up/down"

[features.git] / src / texstream.cpp

diff --git a/src/texstream.cpp b/src/texstream.cpp
index b31cafb0afbbe31f3afe52cf3b80bd1c535847dc..891367ce44bbdeeeb46a37d578fe63e23d59f51b 100644 (file)
--- a/src/texstream.cpp
+++ b/src/texstream.cpp
@@ -90,7 +90,7 @@ size_t otexstringstream::length()
 
 TexString otexstringstream::release()
 {
-       TexString ts(ods_.str(), move(texrow()));
+       TexString ts(ods_.str(), std::move(texrow()));
        // reset this
        texrow() = TexRow();
        ods_.clear();
@@ -164,8 +164,8 @@ otexstream & operator<<(otexstream & ots, odocstream_manip pf)
 otexrowstream & operator<<(otexrowstream & ots, TexString ts)
 {
        ts.validate();
-       ots.os() << move(ts.str);
-       ots.texrow().append(move(ts.texrow));
+       ots.os() << std::move(ts.str);
+       ots.texrow().append(std::move(ts.texrow));
        return ots;
 }
 
@@ -201,7 +201,7 @@ otexstream & operator<<(otexstream & ots, TexString ts)
                ots.canBreakLine(ts.str[len - 2] != '\n');
        ots.lastChar(ts.str[len - 1]);
 
-       otrs << move(ts);
+       otrs << std::move(ts);
        return ots;
 }
 
@@ -330,7 +330,7 @@ template otexrowstream & operator<< <unsigned int>(otexrowstream &,
 template otexrowstream & operator<< <unsigned long>(otexrowstream &,
                                                                                                        unsigned long);
 
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
                                                          unsigned long long);
 #endif
@@ -351,8 +351,8 @@ template otexstream & operator<< <double>(otexstream &, double);
 template otexstream & operator<< <int>(otexstream &, int);
 template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
 template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
 #endif
 
-}
+} // namespace lyx