ソースを参照

astc: Delete Bits' copy contstructor and assignment operator

This also potentially avoids warnings, considering the copy assignment
operator is supposed to have a return value.
Lioncash 8 年 前
コミット
e3fadb9616
1 ファイル変更6 行追加8 行削除
  1. 6 8
      src/video_core/textures/astc.cpp

+ 6 - 8
src/video_core/textures/astc.cpp

@@ -105,17 +105,12 @@ private:
 
 template <typename IntType>
 class Bits {
-private:
-    const IntType& m_Bits;
-
-    // Don't copy
-    Bits() {}
-    Bits(const Bits&) {}
-    Bits& operator=(const Bits&) {}
-
 public:
     explicit Bits(IntType& v) : m_Bits(v) {}
 
+    Bits(const Bits&) = delete;
+    Bits& operator=(const Bits&) = delete;
+
     uint8_t operator[](uint32_t bitPos) {
         return static_cast<uint8_t>((m_Bits >> bitPos) & 1);
     }
@@ -132,6 +127,9 @@ public:
         uint64_t mask = (1 << (end - start + 1)) - 1;
         return (m_Bits >> start) & mask;
     }
+
+private:
+    const IntType& m_Bits;
 };
 
 enum EIntegerEncoding { eIntegerEncoding_JustBits, eIntegerEncoding_Quint, eIntegerEncoding_Trit };