ソースを参照

Let compiler synthesize QuadDef move assignment operator
This hopefully fixes a compile issue with older clang versions.

rdb 9 年 前
コミット
9facf874ab
1 ファイル変更0 行追加15 行削除
  1. 0 15
      panda/src/text/textAssembler.h

+ 0 - 15
panda/src/text/textAssembler.h

@@ -212,21 +212,6 @@ private:
   typedef pmap<GeomCollectorKey, GeomCollector> GeomCollectorMap;
 
   struct QuadDef {
-    // Copying this class is a performance hotspot, hence we define the move
-    // constructor.
-    ALWAYS_INLINE QuadDef() {}
-    ALWAYS_INLINE QuadDef(const QuadDef &copy) :
-      _dimensions(copy._dimensions), _uvs(copy._uvs),
-      _slantl(copy._slantl), _slanth(copy._slanth),
-      _glyph(copy._glyph) {}
-
-#ifdef USE_MOVE_SEMANTICS
-    ALWAYS_INLINE QuadDef(QuadDef &&from) NOEXCEPT :
-      _dimensions(from._dimensions), _uvs(from._uvs),
-      _slantl(from._slantl), _slanth(from._slanth),
-      _glyph(move(from._glyph)) {}
-#endif
-
     LVecBase4 _dimensions;
     LVecBase4 _uvs;
     PN_stdfloat _slantl, _slanth;