Merge pull request #2779 from SunBlack/modernize-use-equals-delete

Use =delete for disabled special member
PointCloudLibrary · Jan 18, 2019 · 0cae502 · 0cae502
2 parents 1928ef1 + 7f5b740
commit 0cae502
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/gpu/kinfu_large_scale/tools/record_maps_rgb.cpp b/gpu/kinfu_large_scale/tools/record_maps_rgb.cpp
@@ -126,8 +126,8 @@ class MapsBuffer
     }
 
   private:
-    MapsBuffer (const MapsBuffer&); // Disabled copy constructor
-    MapsBuffer& operator =(const MapsBuffer&); // Disabled assignment operator
+    MapsBuffer (const MapsBuffer&) = delete; // Disabled copy constructor
+    MapsBuffer& operator =(const MapsBuffer&) = delete; // Disabled assignment operator
 
     boost::mutex bmutex_;
     boost::condition_variable buff_empty_;

diff --git a/gpu/people/src/cuda/nvidia/NCV.hpp b/gpu/people/src/cuda/nvidia/NCV.hpp
@@ -522,7 +522,7 @@ NCV_EXPORTS NCVStatus memSegCopyHelper2D(void *dst, Ncv32u dstPitch, NCVMemoryTy
 template <class T>
 class NCVVector
 {
-    NCVVector(const NCVVector &);
+    NCVVector(const NCVVector &) = delete;
 
 public:
 
@@ -585,9 +585,9 @@ class NCVVector
 template <class T>
 class NCVVectorAlloc : public NCVVector<T>
 {
-    NCVVectorAlloc();
-    NCVVectorAlloc(const NCVVectorAlloc &);
-    NCVVectorAlloc& operator=(const NCVVectorAlloc<T>&);	
+    NCVVectorAlloc() = delete;
+    NCVVectorAlloc(const NCVVectorAlloc &) = delete;
+    NCVVectorAlloc& operator=(const NCVVectorAlloc<T>&) = delete;	
 
 public:
 
@@ -645,8 +645,8 @@ class NCVVectorAlloc : public NCVVector<T>
 template <class T>
 class NCVVectorReuse : public NCVVector<T>
 {
-    NCVVectorReuse();
-    NCVVectorReuse(const NCVVectorReuse &);
+    NCVVectorReuse() = delete;
+    NCVVectorReuse(const NCVVectorReuse &) = delete;
 
 public:
 
@@ -694,7 +694,7 @@ class NCVVectorReuse : public NCVVector<T>
 template <class T>
 class NCVMatrix
 {
-    NCVMatrix(const NCVMatrix &);
+    NCVMatrix(const NCVMatrix &) = delete;
 
 public:
 
@@ -800,9 +800,9 @@ class NCVMatrix
 template <class T>
 class NCVMatrixAlloc : public NCVMatrix<T>
 {
-    NCVMatrixAlloc();
-    NCVMatrixAlloc(const NCVMatrixAlloc &);
-    NCVMatrixAlloc& operator=(const NCVMatrixAlloc &);
+    NCVMatrixAlloc() = delete;
+    NCVMatrixAlloc(const NCVMatrixAlloc &) = delete;
+    NCVMatrixAlloc& operator=(const NCVMatrixAlloc &) = delete;
 public:
 
     NCVMatrixAlloc(INCVMemAllocator &allocator, Ncv32u width, Ncv32u height, Ncv32u pitch=0)
@@ -875,8 +875,8 @@ class NCVMatrixAlloc : public NCVMatrix<T>
 template <class T>
 class NCVMatrixReuse : public NCVMatrix<T>
 {
-    NCVMatrixReuse();
-    NCVMatrixReuse(const NCVMatrixReuse &);
+    NCVMatrixReuse() = delete;
+    NCVMatrixReuse(const NCVMatrixReuse &) = delete;
 
 public:
 

diff --git a/io/tools/openni_pcd_recorder.cpp b/io/tools/openni_pcd_recorder.cpp
@@ -142,8 +142,8 @@ class PCDBuffer
     }
 
   private:
-    PCDBuffer (const PCDBuffer&); // Disabled copy constructor
-    PCDBuffer& operator = (const PCDBuffer&); // Disabled assignment operator
+    PCDBuffer (const PCDBuffer&) = delete; // Disabled copy constructor
+    PCDBuffer& operator = (const PCDBuffer&) = delete; // Disabled assignment operator
 
     boost::mutex bmutex_;
     boost::condition_variable buff_empty_;

diff --git a/outofcore/include/pcl/outofcore/visualization/scene.h b/outofcore/include/pcl/outofcore/visualization/scene.h
@@ -15,9 +15,9 @@ class Scene
   static Scene *instance_;
 
   Scene ();
-  Scene (const Scene& op);
+  Scene (const Scene& op) = delete;
   Scene&
-  operator= (const Scene& op);
+  operator= (const Scene& op) = delete;
 
 public:
 

diff --git a/visualization/tools/openni_image.cpp b/visualization/tools/openni_image.cpp
@@ -246,8 +246,8 @@ class Buffer
     }
 
 	private:
-		Buffer (const Buffer&);            // Disabled copy constructor
-		Buffer& operator =(const Buffer&); // Disabled assignment operator
+		Buffer (const Buffer&) = delete;            // Disabled copy constructor
+		Buffer& operator =(const Buffer&) = delete; // Disabled assignment operator
 
     boost::mutex bmutex_;
 		boost::condition_variable buff_empty_;