traits c++17 simpler syntax

MRPT · Aug 26, 2018 · 4c92684 · 4c92684
1 parent 42a4b58
commit 4c92684
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CDUO3DCamera.h b/libs/hwdrivers/include/mrpt/hwdrivers/CDUO3DCamera.h
@@ -250,8 +250,8 @@ class CDUO3DCamera
 
 };  // End of class
 
-static_assert(!std::is_copy_constructible<CDUO3DCamera>::value, "Copy Check");
+static_assert(!std::is_copy_constructible_v<CDUO3DCamera>, "Copy Check");
-static_assert(!std::is_copy_assignable<CDUO3DCamera>::value, "Assign Check");
+static_assert(!std::is_copy_assignable_v<CDUO3DCamera>, "Assign Check");
 }
 #endif
 

diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CGenericSensor.h b/libs/hwdrivers/include/mrpt/hwdrivers/CGenericSensor.h
@@ -297,8 +297,8 @@ class CGenericSensor
 };  // end of class
 
 static_assert(
-	!std::is_copy_constructible<CGenericSensor>::value &&
+	!std::is_copy_constructible_v<CGenericSensor> &&
-		!std::is_copy_assignable<CGenericSensor>::value,
+		!std::is_copy_assignable_v<CGenericSensor>,
 	"Copy Check");
 
 #define SENSOR_CLASS_ID(class_name)                      \

diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CImageGrabber_FlyCapture2.h b/libs/hwdrivers/include/mrpt/hwdrivers/CImageGrabber_FlyCapture2.h
@@ -280,8 +280,8 @@ class CImageGrabber_FlyCapture2
 	inline bool isStereo() { return m_options.stereo_mode; }
 };  // End of class
 static_assert(
-	!std::is_copy_constructible<CImageGrabber_FlyCapture2>::value &&
+	!std::is_copy_constructible_v<CImageGrabber_FlyCapture2> &&
-		!std::is_copy_assignable<CImageGrabber_FlyCapture2>::value,
+		!std::is_copy_assignable_v<CImageGrabber_FlyCapture2>,
 	"Copy Check");
 }
 #endif

diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CStereoGrabber_Bumblebee_libdc1394.h b/libs/hwdrivers/include/mrpt/hwdrivers/CStereoGrabber_Bumblebee_libdc1394.h
@@ -69,8 +69,8 @@ class CStereoGrabber_Bumblebee_libdc1394
 	bool m_bInitialized;
 };  // End of class
 static_assert(
-	!std::is_copy_constructible<CStereoGrabber_Bumblebee_libdc1394>::value &&
+	!std::is_copy_constructible_v<CStereoGrabber_Bumblebee_libdc1394> &&
-		!std::is_copy_assignable<CStereoGrabber_Bumblebee_libdc1394>::value,
+		!std::is_copy_assignable_v<CStereoGrabber_Bumblebee_libdc1394>,
 	"Copy Check");
 }
 
diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CStereoGrabber_SVS.h b/libs/hwdrivers/include/mrpt/hwdrivers/CStereoGrabber_SVS.h
@@ -114,8 +114,8 @@ class CStereoGrabber_SVS
 
 };  // End of class
 static_assert(
-	!std::is_copy_constructible<CStereoGrabber_SVS>::value &&
+	!std::is_copy_constructible_v<CStereoGrabber_SVS> &&
-		!std::is_copy_assignable<CStereoGrabber_SVS>::value,
+		!std::is_copy_assignable_v<CStereoGrabber_SVS>,
 	"Copy Check");
 }
 #endif

diff --git a/libs/io/include/mrpt/io/CFileGZOutputStream.h b/libs/io/include/mrpt/io/CFileGZOutputStream.h
@@ -69,8 +69,8 @@ class CFileGZOutputStream : public CStream
 	size_t Write(const void* Buffer, size_t Count) override;
 };  // End of class def.
 static_assert(
-	!std::is_copy_constructible<CFileGZOutputStream>::value &&
+	!std::is_copy_constructible_v<CFileGZOutputStream> &&
-		!std::is_copy_assignable<CFileGZOutputStream>::value,
+		!std::is_copy_assignable_v<CFileGZOutputStream>,
 	"Copy Check");
 }
 
diff --git a/libs/io/include/mrpt/io/CFileOutputStream.h b/libs/io/include/mrpt/io/CFileOutputStream.h
@@ -76,8 +76,8 @@ class CFileOutputStream : public CStream
 	size_t Write(const void* Buffer, size_t Count) override;
 };  // End of class def.
 static_assert(
-	!std::is_copy_constructible<CFileOutputStream>::value &&
+	!std::is_copy_constructible_v<CFileOutputStream> &&
-		!std::is_copy_assignable<CFileOutputStream>::value,
+		!std::is_copy_assignable_v<CFileOutputStream>,
 	"Copy Check");
 }
 
diff --git a/libs/io/include/mrpt/io/CPipe.h b/libs/io/include/mrpt/io/CPipe.h
@@ -114,8 +114,8 @@ class CPipeBaseEndPoint : public mrpt::io::CStream
 	virtual uint64_t getPosition() const override;
 };  // end of CPipeBaseEndPoint
 static_assert(
-	!std::is_copy_constructible<CPipeBaseEndPoint>::value &&
+	!std::is_copy_constructible_v<CPipeBaseEndPoint> &&
-		!std::is_copy_assignable<CPipeBaseEndPoint>::value,
+		!std::is_copy_assignable_v<CPipeBaseEndPoint>,
 	"Copy Check");
 
 /** The read end-point in a pipe created with mrpt::synch::CPipe.

diff --git a/libs/io/src/CFileGZInputStream.cpp b/libs/io/src/CFileGZInputStream.cpp
@@ -19,8 +19,8 @@ using namespace mrpt::io;
 using namespace std;
 
 static_assert(
-	!std::is_copy_constructible<CFileGZInputStream>::value &&
+	!std::is_copy_constructible_v<CFileGZInputStream> &&
-		!std::is_copy_assignable<CFileGZInputStream>::value,
+		!std::is_copy_assignable_v<CFileGZInputStream>,
 	"Copy Check");
 
 #define THE_GZFILE reinterpret_cast<gzFile>(m_f)

diff --git a/libs/io/src/CFileInputStream.cpp b/libs/io/src/CFileInputStream.cpp
@@ -16,8 +16,8 @@ using namespace mrpt::io;
 using namespace std;
 
 static_assert(
-	!std::is_copy_constructible<CFileInputStream>::value &&
+	!std::is_copy_constructible_v<CFileInputStream> &&
-		!std::is_copy_assignable<CFileInputStream>::value,
+		!std::is_copy_assignable_v<CFileInputStream>,
 	"Copy Check");
 
 CFileInputStream::CFileInputStream(const string& fileName) : m_if()

diff --git a/libs/io/src/CFileStream.cpp b/libs/io/src/CFileStream.cpp
@@ -18,8 +18,8 @@ using namespace mrpt::io;
 using namespace std;
 
 static_assert(
-	!std::is_copy_constructible<CFileStream>::value &&
+	!std::is_copy_constructible_v<CFileStream> &&
-		!std::is_copy_assignable<CFileStream>::value,
+		!std::is_copy_assignable_v<CFileStream>,
 	"Copy Check");
 
 /*---------------------------------------------------------------

diff --git a/libs/math/include/mrpt/math/CSparseMatrix.h b/libs/math/include/mrpt/math/CSparseMatrix.h
@@ -498,8 +498,8 @@ class CSparseMatrix
 		void update(const CSparseMatrix& new_SM);
 	};
 	static_assert(
-		!std::is_copy_constructible<CholeskyDecomp>::value &&
+		!std::is_copy_constructible_v<CholeskyDecomp> &&
-			!std::is_copy_assignable<CholeskyDecomp>::value,
+			!std::is_copy_assignable_v<CholeskyDecomp>,
 		"Copy Check");
 
 	/** @} */

diff --git a/libs/system/src/CTicTac.cpp b/libs/system/src/CTicTac.cpp
@@ -22,8 +22,8 @@
 
 #include <type_traits>
 static_assert(
-	!std::is_copy_constructible<mrpt::system::CTicTac>::value &&
+	!std::is_copy_constructible_v<mrpt::system::CTicTac> &&
-		!std::is_copy_assignable<mrpt::system::CTicTac>::value,
+		!std::is_copy_assignable_v<mrpt::system::CTicTac>,
 	"Copy Check");
 
 // For Windows: get the common code out of CTicTac so it's only run once!