AURORA: Mark GFF3File and GFF4File as noncopyable

The default copy-constructors and assignment operators would just mess them up.
xoreos · Oct 19, 2016 · 82c5b76 · 82c5b76
1 parent de6d684
commit 82c5b76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/aurora/gff3file.h b/src/aurora/gff3file.h
@@ -29,6 +29,7 @@
 #include <map>
 
 #include "src/common/types.h"
+#include "src/common/noncopyable.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -72,7 +73,7 @@ class GFF3Struct;
  *  See also: GFF4File in gff4file.h for the later V4.0/V4.1 versions of
  *  the GFF format.
  */
-class GFF3File : public AuroraFile {
+class GFF3File : Common::NonCopyable, public AuroraFile {
 public:
 	/** Take over this stream and read a GFF3 file out of it. */
 	GFF3File(Common::SeekableReadStream *gff3, uint32 id = 0xFFFFFFFF, bool repairNWNPremium = false);

diff --git a/src/aurora/gff4file.h b/src/aurora/gff4file.h
@@ -29,6 +29,7 @@
 #include <map>
 
 #include "src/common/types.h"
+#include "src/common/noncopyable.h"
 #include "src/common/ustring.h"
 #include "src/common/encoding.h"
 
@@ -72,7 +73,7 @@ class GFF4Struct;
  *  See also: GFF3File in gff3file.h for the earlier V3.2/V3.3 versions of
  *  the GFF format.
  */
-class GFF4File : public AuroraFile {
+class GFF4File : Common::NonCopyable, public AuroraFile {
 public:
 	/** Take over this stream and read a GFF4 file out of it. */
 	GFF4File(Common::SeekableReadStream *gff4, uint32 type = 0xFFFFFFFF);