Fix build with clang trunk - unqualified call to std::move

LebedevRI · LebedevRI · commit 1a1b723420bd · 2022-03-04T20:37:32.000+03:00
diff --git a/src/librawspeed/decoders/ArwDecoder.cpp b/src/librawspeed/decoders/ArwDecoder.cpp
@@ -92,7 +92,7 @@ RawImage ArwDecoder::decodeSRF(const TiffIFD* raw) {
   SonyDecrypt(reinterpret_cast<const uint32_t*>(image_data),
               reinterpret_cast<uint32_t*>(image_decoded.get()), len / 4, key);
 
-  Buffer di(move(image_decoded), len);
+  Buffer di(std::move(image_decoded), len);
 
   // And now decode as a normal 16bit raw
   mRaw->dim = iPoint2D(width, height);
diff --git a/src/librawspeed/decoders/ArwDecoder.h b/src/librawspeed/decoders/ArwDecoder.h
@@ -40,7 +40,7 @@ class ArwDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   ArwDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/Cr2Decoder.h b/src/librawspeed/decoders/Cr2Decoder.h
@@ -37,7 +37,7 @@ class Cr2Decoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   Cr2Decoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void checkSupportInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/CrwDecoder.cpp b/src/librawspeed/decoders/CrwDecoder.cpp
@@ -58,7 +58,7 @@ bool CrwDecoder::isCRW(const Buffer& input) {
 
 CrwDecoder::CrwDecoder(std::unique_ptr<const CiffIFD> rootIFD,
                        const Buffer& file)
-    : RawDecoder(file), mRootIFD(move(rootIFD)) {}
+    : RawDecoder(file), mRootIFD(std::move(rootIFD)) {}
 
 RawImage CrwDecoder::decodeRawInternal() {
   const CiffEntry* rawData = mRootIFD->getEntry(CiffTag::RAWDATA);
diff --git a/src/librawspeed/decoders/DcrDecoder.h b/src/librawspeed/decoders/DcrDecoder.h
@@ -39,7 +39,7 @@ class DcrDecoder final : public SimpleTiffDecoder {
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   DcrDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : SimpleTiffDecoder(move(root), file) {}
+      : SimpleTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/DcsDecoder.h b/src/librawspeed/decoders/DcsDecoder.h
@@ -39,7 +39,7 @@ class DcsDecoder final : public SimpleTiffDecoder {
   static bool __attribute__((pure))
   isAppropriateDecoder(const TiffRootIFD* rootIFD, const Buffer& file);
   DcsDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : SimpleTiffDecoder(move(root), file) {}
+      : SimpleTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/DngDecoder.cpp b/src/librawspeed/decoders/DngDecoder.cpp
@@ -60,7 +60,7 @@ DngDecoder::isAppropriateDecoder(const TiffRootIFD* rootIFD,
 }
 
 DngDecoder::DngDecoder(TiffRootIFDOwner&& rootIFD, const Buffer& file)
-    : AbstractTiffDecoder(move(rootIFD), file) {
+    : AbstractTiffDecoder(std::move(rootIFD), file) {
   if (!mRootIFD->hasEntryRecursive(TiffTag::DNGVERSION))
     ThrowRDE("DNG, but version tag is missing. Will not guess.");
 
diff --git a/src/librawspeed/decoders/ErfDecoder.h b/src/librawspeed/decoders/ErfDecoder.h
@@ -39,7 +39,7 @@ class ErfDecoder final : public SimpleTiffDecoder {
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   ErfDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : SimpleTiffDecoder(move(root), file) {}
+      : SimpleTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/IiqDecoder.h b/src/librawspeed/decoders/IiqDecoder.h
@@ -54,7 +54,7 @@ class IiqDecoder final : public AbstractTiffDecoder {
                                    const Buffer& file);
 
   IiqDecoder(TiffRootIFDOwner&& rootIFD, const Buffer& file)
-      : AbstractTiffDecoder(move(rootIFD), file) {}
+      : AbstractTiffDecoder(std::move(rootIFD), file) {}
 
   RawImage decodeRawInternal() override;
   void checkSupportInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/KdcDecoder.h b/src/librawspeed/decoders/KdcDecoder.h
@@ -39,7 +39,7 @@ class KdcDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   KdcDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/MefDecoder.h b/src/librawspeed/decoders/MefDecoder.h
@@ -38,7 +38,7 @@ class MefDecoder final : public SimpleTiffDecoder {
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   MefDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : SimpleTiffDecoder(move(root), file) {}
+      : SimpleTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/MosDecoder.cpp b/src/librawspeed/decoders/MosDecoder.cpp
@@ -69,7 +69,7 @@ bool MosDecoder::isAppropriateDecoder(const TiffRootIFD* rootIFD,
 }
 
 MosDecoder::MosDecoder(TiffRootIFDOwner&& rootIFD, const Buffer& file)
-    : AbstractTiffDecoder(move(rootIFD), file) {
+    : AbstractTiffDecoder(std::move(rootIFD), file) {
   if (mRootIFD->getEntryRecursive(TiffTag::MAKE)) {
     auto id = mRootIFD->getID();
     make = id.make;
diff --git a/src/librawspeed/decoders/NefDecoder.h b/src/librawspeed/decoders/NefDecoder.h
@@ -43,7 +43,7 @@ class NefDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   NefDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/OrfDecoder.h b/src/librawspeed/decoders/OrfDecoder.h
@@ -41,7 +41,7 @@ class OrfDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   OrfDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/PefDecoder.h b/src/librawspeed/decoders/PefDecoder.h
@@ -36,7 +36,7 @@ class PefDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   PefDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/RafDecoder.h b/src/librawspeed/decoders/RafDecoder.h
@@ -39,7 +39,7 @@ class RafDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   RafDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void applyCorrections(const Camera* cam);
diff --git a/src/librawspeed/decoders/Rw2Decoder.h b/src/librawspeed/decoders/Rw2Decoder.h
@@ -38,7 +38,7 @@ class Rw2Decoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   Rw2Decoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/SimpleTiffDecoder.h b/src/librawspeed/decoders/SimpleTiffDecoder.h
@@ -36,7 +36,7 @@ class SimpleTiffDecoder : public AbstractTiffDecoder {
 
 public:
   SimpleTiffDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   void prepareForRawDecoding();
 
diff --git a/src/librawspeed/decoders/SrwDecoder.h b/src/librawspeed/decoders/SrwDecoder.h
@@ -37,7 +37,7 @@ class SrwDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   SrwDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/decoders/ThreefrDecoder.h b/src/librawspeed/decoders/ThreefrDecoder.h
@@ -37,7 +37,7 @@ class ThreefrDecoder final : public AbstractTiffDecoder
   static bool isAppropriateDecoder(const TiffRootIFD* rootIFD,
                                    const Buffer& file);
   ThreefrDecoder(TiffRootIFDOwner&& root, const Buffer& file)
-      : AbstractTiffDecoder(move(root), file) {}
+      : AbstractTiffDecoder(std::move(root), file) {}
 
   RawImage decodeRawInternal() override;
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
diff --git a/src/librawspeed/io/FileReader.cpp b/src/librawspeed/io/FileReader.cpp
@@ -114,7 +114,7 @@ std::unique_ptr<const Buffer> FileReader::readFile() {
 
 #endif // __unix__
 
-  return std::make_unique<Buffer>(move(dest), fileSize);
+  return std::make_unique<Buffer>(std::move(dest), fileSize);
 }
 
 } // namespace rawspeed
diff --git a/src/librawspeed/parsers/CiffParser.cpp b/src/librawspeed/parsers/CiffParser.cpp
@@ -71,7 +71,7 @@ std::unique_ptr<RawDecoder> CiffParser::getDecoder(const CameraMetaData* meta) {
     const std::string make = trimSpaces(mm->getString());
 
     if (make == "Canon")
-      return std::make_unique<CrwDecoder>(move(mRootIFD), mInput);
+      return std::make_unique<CrwDecoder>(std::move(mRootIFD), mInput);
   }
 
   ThrowCPE("No decoder found. Sorry.");
diff --git a/src/librawspeed/parsers/FiffParser.cpp b/src/librawspeed/parsers/FiffParser.cpp
@@ -117,7 +117,7 @@ void FiffParser::parseData() {
     }
   }
 
-  rootIFD->add(move(subIFD));
+  rootIFD->add(std::move(subIFD));
 }
 
 std::unique_ptr<RawDecoder> FiffParser::getDecoder(const CameraMetaData* meta) {
diff --git a/src/librawspeed/parsers/TiffParser.cpp b/src/librawspeed/parsers/TiffParser.cpp
@@ -101,7 +101,7 @@ std::unique_ptr<RawDecoder> TiffParser::makeDecoder(TiffRootIFDOwner root,
     if (!dChecker(root.get(), data))
       continue;
 
-    return dConstructor(move(root), data);
+    return dConstructor(std::move(root), data);
   }
 
   ThrowTPE("No decoder found. Sorry.");
diff --git a/src/librawspeed/tiff/CiffIFD.cpp b/src/librawspeed/tiff/CiffIFD.cpp
@@ -60,7 +60,7 @@ void CiffIFD::parseIFDEntry(NORangesSet<Buffer>* valueDatas,
     // Will we ever look for this entry?
     if (!isIn(t->tag, CiffTagsWeCareAbout))
       return;
-    add(move(t));
+    add(std::move(t));
   }
 }
 
@@ -154,12 +154,12 @@ void CiffIFD::add(std::unique_ptr<CiffIFD> subIFD) {
   // We are good, and actually can add this sub-IFD, right?
   subIFD->recursivelyCheckSubIFDs(0);
 
-  mSubIFD.push_back(move(subIFD));
+  mSubIFD.push_back(std::move(subIFD));
 }
 
 void CiffIFD::add(std::unique_ptr<CiffEntry> entry) {
   assert(isIn(entry->tag, CiffTagsWeCareAbout));
-  mEntry[entry->tag] = move(entry);
+  mEntry[entry->tag] = std::move(entry);
   assert(mEntry.size() <= CiffTagsWeCareAbout.size());
 }
 
diff --git a/src/librawspeed/tiff/TiffIFD.cpp b/src/librawspeed/tiff/TiffIFD.cpp
@@ -64,7 +64,7 @@ void TiffIFD::parseIFDEntry(NORangesSet<Buffer>* ifds, ByteStream& bs) {
       // used anywhere right now, let's not
       //   add(parseDngPrivateData(ifds, t.get()));
       // but just add them as entries. (e.g. ArwDecoder uses WB from them)
-      add(move(t));
+      add(std::move(t));
       break;
 
     case TiffTag::MAKERNOTE:
@@ -80,11 +80,11 @@ void TiffIFD::parseIFDEntry(NORangesSet<Buffer>* ifds, ByteStream& bs) {
       break;
 
     default:
-      add(move(t));
+      add(std::move(t));
     }
   } catch (const RawspeedException&) { // Unparsable private data are added as
                                        // entries
-    add(move(t));
+    add(std::move(t));
   }
 }
 
@@ -281,12 +281,12 @@ void TiffIFD::add(TiffIFDOwner subIFD) {
   // We are good, and actually can add this sub-IFD, right?
   subIFD->recursivelyCheckSubIFDs(0);
 
-  subIFDs.push_back(move(subIFD));
+  subIFDs.push_back(std::move(subIFD));
 }
 
 void TiffIFD::add(TiffEntryOwner entry) {
   entry->parent = this;
-  entries[entry->tag] = move(entry);
+  entries[entry->tag] = std::move(entry);
 }
 
 TiffEntry* TiffIFD::getEntry(TiffTag tag) const {
diff --git a/test/librawspeed/common/PointTest.cpp b/test/librawspeed/common/PointTest.cpp
@@ -80,13 +80,13 @@ TEST(PointTest, Constructor) {
   });
   ASSERT_NO_THROW({
     const iPoint2D a(x, y);
-    iPoint2D b(move(a));
+    iPoint2D b(std::move(a));
     ASSERT_EQ(b.x, x);
     ASSERT_EQ(b.y, y);
   });
   ASSERT_NO_THROW({
     iPoint2D a(x, y);
-    iPoint2D b(move(a));
+    iPoint2D b(std::move(a));
     ASSERT_EQ(b.x, x);
     ASSERT_EQ(b.y, y);
   });
@@ -111,14 +111,14 @@ TEST(PointTest, AssignmentConstructor) {
   ASSERT_NO_THROW({
     iPoint2D a(x, y);
     iPoint2D b(666, 777);
-    b = move(a);
+    b = std::move(a);
     ASSERT_EQ(b.x, x);
     ASSERT_EQ(b.y, y);
   });
   ASSERT_NO_THROW({
     const iPoint2D a(x, y);
     iPoint2D b(666, 777);
-    b = move(a);
+    b = std::move(a);
     ASSERT_EQ(b.x, x);
     ASSERT_EQ(b.y, y);
   });

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ DngDecoder::isAppropriateDecoder(const TiffRootIFD* rootIFD,`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`DngDecoder::DngDecoder(TiffRootIFDOwner&& rootIFD, const Buffer& file)`
`63`		`- : AbstractTiffDecoder(move(rootIFD), file) {`
	`63`	`+ : AbstractTiffDecoder(std::move(rootIFD), file) {`
`64`	`64`	`if (!mRootIFD->hasEntryRecursive(TiffTag::DNGVERSION))`
`65`	`65`	`ThrowRDE("DNG, but version tag is missing. Will not guess.");`
`66`	`66`