From e3b32cce80c52f91b7cdbbefd78214cfd12006cb Mon Sep 17 00:00:00 2001 From: Rok Mandeljc Date: Mon, 29 Dec 2014 16:21:17 +0100 Subject: [PATCH] modules/core: removed extra semi-colon from mat.inl.hpp and utility.hpp This silences the pedantic warning messages from gcc 4.8.3 --- modules/core/include/opencv2/core/mat.inl.hpp | 4 ++-- modules/core/include/opencv2/core/utility.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp index 9ca85116a..73a39e77a 100644 --- a/modules/core/include/opencv2/core/mat.inl.hpp +++ b/modules/core/include/opencv2/core/mat.inl.hpp @@ -1005,13 +1005,13 @@ MatIterator_<_Tp> Mat::end() template inline void Mat::forEach(const Functor& operation) { this->forEach_impl<_Tp>(operation); -}; +} template inline void Mat::forEach(const Functor& operation) const { // call as not const (const_cast(this))->forEach(operation); -}; +} template inline Mat::operator std::vector<_Tp>() const diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp index 43dc8053a..88989ef5c 100644 --- a/modules/core/include/opencv2/core/utility.hpp +++ b/modules/core/include/opencv2/core/utility.hpp @@ -465,7 +465,7 @@ void Mat::forEach_impl(const Functor& operation) { }; parallel_for_(cv::Range(0, LINES), PixelOperationWrapper(reinterpret_cast*>(this), operation)); -}; +} /////////////////////////// Synchronization Primitives ///////////////////////////////