From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 7 Apr 2017 01:11:53 +0000 (+1000)
Subject: Use ue2::noncopyable instead of deleting copy ctor
X-Git-Tag: v4.5.0^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19c7161d04d03ef1b551184496acc8df02058c16;p=thirdparty%2Fvectorscan.git

Use ue2::noncopyable instead of deleting copy ctor
---

diff --git a/src/rose/rose_build_bytecode.cpp b/src/rose/rose_build_bytecode.cpp
index dad00cd6..e7b00126 100644
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@ -278,20 +278,13 @@ struct ExclusiveSubengine {
 };
 
 /** \brief exclusive info to build tamarama */
-struct ExclusiveInfo {
+struct ExclusiveInfo : noncopyable {
     // subengine info
     vector<ExclusiveSubengine> subengines;
     // all the report in tamarama
     set<ReportID> reports;
     // assigned queue id
     u32 queue;
-
-    // workaround a deficiency in the standard (as explained by STL @ MS) we
-    // need to tell the compiler that ExclusiveInfo is moveable-only by
-    // deleting the copy cons so that vector doesn't get confused
-    ExclusiveInfo() = default;
-    ExclusiveInfo(const ExclusiveInfo &) = delete;
-    ExclusiveInfo(ExclusiveInfo &&) = default;
 };
 
 }