Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 8fde8ab4 authored by GARNIER Laurent's avatar GARNIER Laurent
Browse files

Merge branch '120-remove-override-warnings' into '63-add-package-management'

Fix override warnings

See merge request !280
parents 1b47b947 13682719
Branches
Tags
3 merge requests!289Release 3.6.0,!284Add package management,!280Fix override warnings
...@@ -14,37 +14,37 @@ public: ...@@ -14,37 +14,37 @@ public:
// ==================================================================================================================================== // ====================================================================================================================================
private: private:
virtual uint64_t getClockFrequency(Kernel::IBoxAlgorithmContext& ctx) uint64_t getClockFrequency(Kernel::IBoxAlgorithmContext& ctx) override
{ {
CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return getClockFrequency(); return getClockFrequency();
} }
virtual bool initialize(Kernel::IBoxAlgorithmContext& ctx) bool initialize(Kernel::IBoxAlgorithmContext& ctx) override
{ {
CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return initialize(); return initialize();
} }
virtual bool uninitialize(Kernel::IBoxAlgorithmContext& ctx) bool uninitialize(Kernel::IBoxAlgorithmContext& ctx) override
{ {
CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return uninitialize(); return uninitialize();
} }
virtual bool processClock(Kernel::IBoxAlgorithmContext& ctx, Kernel::CMessageClock& msg) bool processClock(Kernel::IBoxAlgorithmContext& ctx, Kernel::CMessageClock& msg) override
{ {
CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return processClock(msg); return processClock(msg);
} }
virtual bool processInput(Kernel::IBoxAlgorithmContext& ctx, const size_t index) bool processInput(Kernel::IBoxAlgorithmContext& ctx, const size_t index) override
{ {
CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return processInput(index); return processInput(index);
} }
virtual bool process(Kernel::IBoxAlgorithmContext& ctx) bool process(Kernel::IBoxAlgorithmContext& ctx) override
{ {
CScopedBoxAlgorithm oScopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx); CScopedBoxAlgorithm oScopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
return process(); return process();
......
...@@ -57,8 +57,7 @@ bool testMatrix(OpenViBE::CMatrix& expectedMatrix, const std::string& textFile, ...@@ -57,8 +57,7 @@ bool testMatrix(OpenViBE::CMatrix& expectedMatrix, const std::string& textFile,
std::cerr << "Error: loading matrix from file " << textFile << "\n"; std::cerr << "Error: loading matrix from file " << textFile << "\n";
return false; return false;
} }
if (!expectedMatrix.isDescriptionEqual(resultMatrix)) {
if (!OpenViBE::Toolkit::Matrix::isDescriptionSimilar(expectedMatrix, resultMatrix)) {
std::cerr << "Error: Descriptions differ between expected matrix and result matrix after save/load\n"; std::cerr << "Error: Descriptions differ between expected matrix and result matrix after save/load\n";
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment