From c60ddaed67bce78f592145e00d64d9b7088b5aaa Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Tue, 26 Nov 2024 22:19:50 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20warnings:=20"extra=20=E2=80=98;=E2=80=99?= =?UTF-8?q?=20[-Wpedantic]"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/src/image/vpColormap.cpp | 2 +- modules/core/src/image/vpImageConvert_yuv.cpp | 2 +- modules/core/src/math/matrix/vpColVector.cpp | 8 ++++---- modules/core/src/tools/geometry/vpPlane.cpp | 2 +- modules/core/src/tools/geometry/vpTriangle.cpp | 2 +- modules/core/src/tools/time/vpTime.cpp | 2 +- modules/robot/src/haptic-device/virtuose/vpVirtuose.cpp | 2 +- .../sensor/src/force-torque/vpForceTorqueIitSensor.cpp | 2 +- .../src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp | 2 +- modules/sensor/src/framegrabber/pylon/vpPylonFactory.cpp | 2 +- .../sensor/src/framegrabber/pylon/vpPylonGrabberGigE.cpp | 2 +- .../sensor/src/framegrabber/pylon/vpPylonGrabberUsb.cpp | 2 +- modules/sensor/src/mocap/vpMocapQualisys.cpp | 2 +- modules/sensor/src/mocap/vpMocapVicon.cpp | 2 +- modules/tracker/blob/src/dots/vpDot.cpp | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/core/src/image/vpColormap.cpp b/modules/core/src/image/vpColormap.cpp index 5fdf8d1c9f..8d470832c4 100644 --- a/modules/core/src/image/vpColormap.cpp +++ b/modules/core/src/image/vpColormap.cpp @@ -1005,7 +1005,7 @@ unsigned char m_winterSrgbBytes[256][3] = { {0, 245, 132}, {0, 246, 131}, {0, 247, 131}, {0, 248, 131}, {0, 249, 130}, {0, 250, 130}, {0, 251, 129}, {0, 252, 129}, {0, 253, 128}, {0, 254, 128}, {0, 255, 127} }; -}; +} BEGIN_VISP_NAMESPACE /*! diff --git a/modules/core/src/image/vpImageConvert_yuv.cpp b/modules/core/src/image/vpImageConvert_yuv.cpp index 3bd4ab23db..6005982cb1 100644 --- a/modules/core/src/image/vpImageConvert_yuv.cpp +++ b/modules/core/src/image/vpImageConvert_yuv.cpp @@ -53,7 +53,7 @@ void vpSAT(int &c) c = val_255; } } -}; +} BEGIN_VISP_NAMESPACE /*! diff --git a/modules/core/src/math/matrix/vpColVector.cpp b/modules/core/src/math/matrix/vpColVector.cpp index 6c9fc1738e..0894d3e798 100644 --- a/modules/core/src/math/matrix/vpColVector.cpp +++ b/modules/core/src/math/matrix/vpColVector.cpp @@ -969,7 +969,7 @@ std::ostream &vpColVector::cppPrint(std::ostream &os, const std::string &matrixN } std::cout << std::endl; return os; -}; +} std::ostream &vpColVector::csvPrint(std::ostream &os) const { @@ -980,7 +980,7 @@ std::ostream &vpColVector::csvPrint(std::ostream &os) const os << std::endl; } return os; -}; +} std::ostream &vpColVector::maplePrint(std::ostream &os) const { @@ -993,7 +993,7 @@ std::ostream &vpColVector::maplePrint(std::ostream &os) const } os << "])" << std::endl; return os; -}; +} std::ostream &vpColVector::matlabPrint(std::ostream &os) const { @@ -1009,7 +1009,7 @@ std::ostream &vpColVector::matlabPrint(std::ostream &os) const } } return os; -}; +} #if defined(VISP_BUILD_DEPRECATED_FUNCTIONS) diff --git a/modules/core/src/tools/geometry/vpPlane.cpp b/modules/core/src/tools/geometry/vpPlane.cpp index d2fdf7805e..71d177b1cd 100644 --- a/modules/core/src/tools/geometry/vpPlane.cpp +++ b/modules/core/src/tools/geometry/vpPlane.cpp @@ -414,5 +414,5 @@ void vpPlane::changeFrame(const vpHomogeneousMatrix &cMo) VISP_EXPORT std::ostream &operator<<(std::ostream &os, const vpPlane &p) { return (os << "(" << p.getA() << "," << p.getB() << "," << p.getC() << "," << p.getD() << ") "); -}; +} END_VISP_NAMESPACE diff --git a/modules/core/src/tools/geometry/vpTriangle.cpp b/modules/core/src/tools/geometry/vpTriangle.cpp index 9b979ddf97..511bd86c4b 100644 --- a/modules/core/src/tools/geometry/vpTriangle.cpp +++ b/modules/core/src/tools/geometry/vpTriangle.cpp @@ -100,7 +100,7 @@ vpTriangle &vpTriangle::operator=(const vpTriangle &tri) apex2 = tri.apex2; apex3 = tri.apex3; return *this; -}; +} /*! Initialise the triangle thanks to the three 2D points \f$ iP1 \f$, \f$ iP2 diff --git a/modules/core/src/tools/time/vpTime.cpp b/modules/core/src/tools/time/vpTime.cpp index 9f4a36e5f4..7962dc4df7 100644 --- a/modules/core/src/tools/time/vpTime.cpp +++ b/modules/core/src/tools/time/vpTime.cpp @@ -374,7 +374,7 @@ std::string getDateTime(const std::string &format) } #ifndef DOXYGEN_SHOULD_SKIP_THIS -}; +} #endif vpChrono::vpChrono() : m_durationMs(), m_lastTimePoint() { } diff --git a/modules/robot/src/haptic-device/virtuose/vpVirtuose.cpp b/modules/robot/src/haptic-device/virtuose/vpVirtuose.cpp index 67e1e45b1e..29e36f6817 100644 --- a/modules/robot/src/haptic-device/virtuose/vpVirtuose.cpp +++ b/modules/robot/src/haptic-device/virtuose/vpVirtuose.cpp @@ -1054,5 +1054,5 @@ void vpVirtuose::stopPeriodicFunction() END_VISP_NAMESPACE #else // Work around to avoid warning -void dummy_vpVirtuose() { }; +void dummy_vpVirtuose() { } #endif diff --git a/modules/sensor/src/force-torque/vpForceTorqueIitSensor.cpp b/modules/sensor/src/force-torque/vpForceTorqueIitSensor.cpp index 0648db04b4..cd51856697 100644 --- a/modules/sensor/src/force-torque/vpForceTorqueIitSensor.cpp +++ b/modules/sensor/src/force-torque/vpForceTorqueIitSensor.cpp @@ -242,5 +242,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_sensor.a(vpForceTorqueIitSensor.cpp.o) has no symbols -void dummy_vpForceTorqueIitSensor() { }; +void dummy_vpForceTorqueIitSensor() { } #endif diff --git a/modules/sensor/src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp b/modules/sensor/src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp index 00108e5470..f38ffce676 100644 --- a/modules/sensor/src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp +++ b/modules/sensor/src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp @@ -1463,5 +1463,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_flycapture.a(vpFlyCaptureGrabber.cpp.o) has no symbols -void dummy_vpFlyCaptureGrabber() { }; +void dummy_vpFlyCaptureGrabber() { } #endif diff --git a/modules/sensor/src/framegrabber/pylon/vpPylonFactory.cpp b/modules/sensor/src/framegrabber/pylon/vpPylonFactory.cpp index 51e11531b0..c7a68d3671 100644 --- a/modules/sensor/src/framegrabber/pylon/vpPylonFactory.cpp +++ b/modules/sensor/src/framegrabber/pylon/vpPylonFactory.cpp @@ -86,5 +86,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_pylon.a(vpPylonFactory.cpp.o) has no symbols -void dummy_vpPylonFactory() { }; +void dummy_vpPylonFactory() { } #endif // #ifdef VISP_HAVE_PYLON diff --git a/modules/sensor/src/framegrabber/pylon/vpPylonGrabberGigE.cpp b/modules/sensor/src/framegrabber/pylon/vpPylonGrabberGigE.cpp index 66b205ffcc..756e4a0184 100644 --- a/modules/sensor/src/framegrabber/pylon/vpPylonGrabberGigE.cpp +++ b/modules/sensor/src/framegrabber/pylon/vpPylonGrabberGigE.cpp @@ -815,5 +815,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_pylon.a(vpPylonGrabberGigE.cpp.o) has no symbols -void dummy_vpPylonGrabberGigE() { }; +void dummy_vpPylonGrabberGigE() { } #endif // #ifdef VISP_HAVE_PYLON diff --git a/modules/sensor/src/framegrabber/pylon/vpPylonGrabberUsb.cpp b/modules/sensor/src/framegrabber/pylon/vpPylonGrabberUsb.cpp index ffd2f68530..00a90ca60d 100644 --- a/modules/sensor/src/framegrabber/pylon/vpPylonGrabberUsb.cpp +++ b/modules/sensor/src/framegrabber/pylon/vpPylonGrabberUsb.cpp @@ -797,5 +797,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_pylon.a(vpPylonGrabberUsb.cpp.o) has no symbols -void dummy_vpPylonGrabberUsb() { }; +void dummy_vpPylonGrabberUsb() { } #endif // #ifdef VISP_HAVE_PYLON diff --git a/modules/sensor/src/mocap/vpMocapQualisys.cpp b/modules/sensor/src/mocap/vpMocapQualisys.cpp index 0f48be1f2b..3dfe789068 100644 --- a/modules/sensor/src/mocap/vpMocapQualisys.cpp +++ b/modules/sensor/src/mocap/vpMocapQualisys.cpp @@ -315,5 +315,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_sensor.a(vpMocapQualisys.cpp.o) has no symbols -void dummy_vpMocapQualisys() { }; +void dummy_vpMocapQualisys() { } #endif diff --git a/modules/sensor/src/mocap/vpMocapVicon.cpp b/modules/sensor/src/mocap/vpMocapVicon.cpp index 22482ac5e9..5ed27fd191 100644 --- a/modules/sensor/src/mocap/vpMocapVicon.cpp +++ b/modules/sensor/src/mocap/vpMocapVicon.cpp @@ -272,5 +272,5 @@ END_VISP_NAMESPACE #else // Work around to avoid warning: // libvisp_sensor.a(vpMocapVicon.cpp.o) has no symbols -void dummy_vpMocapVicon() { }; +void dummy_vpMocapVicon() { } #endif diff --git a/modules/tracker/blob/src/dots/vpDot.cpp b/modules/tracker/blob/src/dots/vpDot.cpp index 3504d57ac3..3283c93a63 100644 --- a/modules/tracker/blob/src/dots/vpDot.cpp +++ b/modules/tracker/blob/src/dots/vpDot.cpp @@ -916,6 +916,6 @@ void vpDot::display(const vpImage &I, const vpImagePoint &cog, const std details about the orientation of the frame see the vpImagePoint documentation) to the stream \e os, and returns a reference to the stream. */ -VISP_EXPORT std::ostream &operator<<(std::ostream &os, vpDot &d) { return (os << "(" << d.getCog() << ")"); }; +VISP_EXPORT std::ostream &operator<<(std::ostream &os, vpDot &d) { return (os << "(" << d.getCog() << ")"); } END_VISP_NAMESPACE